Measure the sync wizard dialog in appropriate units:

specifically, units proportional to the fonts used inside of it.

We approximate the font chosen by the wizard's CSS.  In actuality, the
CSS chooses a font-face "arial", "sans-serif".  We just use the default
sans serif font; arial is the default value for that property.

This fixes an issue where changing to the "Windows Classic" theme
on Vista would cause the dialog to be resized, clipping its
contents, which are unaffected by the UI font size.

Update the default GRIT sizes to closely match the old ones.

Old vs new:
http://www.corp.google.com/~ncarter/wizard-size-screenshots.png

BUG=21828
TEST=verified old size against new size in Aero Theme with default
settings; verified size stays the same under Classic theme.

Review URL: http://codereview.chromium.org/261017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28465 0039d316-1c4b-4281-b951-d872f2087c98

54 files changed, 147 insertions, 109 deletions

diff --git a/chrome/app/resources/locale_settings.grd b/chrome/app/resources/locale_settings.grd
index 8a5616b..65fee3a 100644
--- a/chrome/app/resources/locale_settings.grd
+++ b/chrome/app/resources/locale_settings.grd
@@ -652,12 +652,12 @@
       
       <!-- The width of the sync setup wizard / login dialog in characters. -->
       <message name="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS" use_name_for_id="true">
-        45
+        30
       </message>
       
       <!-- The height of the sync setup wizard / login dialog in lines. -->
       <message name="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES" use_name_for_id="true">
-        25
+        15.5
       </message>
 
       <message name="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS" use_name_for_id="true">
diff --git a/chrome/app/resources/locale_settings_ar.xtb b/chrome/app/resources/locale_settings_ar.xtb
index f4b4642..6afdfd9 100644
--- a/chrome/app/resources/locale_settings_ar.xtb
+++ b/chrome/app/resources/locale_settings_ar.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_bg.xtb b/chrome/app/resources/locale_settings_bg.xtb
index 2d43e77..5c60b22 100644
--- a/chrome/app/resources/locale_settings_bg.xtb
+++ b/chrome/app/resources/locale_settings_bg.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_bn.xtb b/chrome/app/resources/locale_settings_bn.xtb
index fbec09f..c2aaa10 100644
--- a/chrome/app/resources/locale_settings_bn.xtb
+++ b/chrome/app/resources/locale_settings_bn.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_ca.xtb b/chrome/app/resources/locale_settings_ca.xtb
index bde8783..9b8d59f 100644
--- a/chrome/app/resources/locale_settings_ca.xtb
+++ b/chrome/app/resources/locale_settings_ca.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_cs.xtb b/chrome/app/resources/locale_settings_cs.xtb
index 7859f4b..382961a 100644
--- a/chrome/app/resources/locale_settings_cs.xtb
+++ b/chrome/app/resources/locale_settings_cs.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_da.xtb b/chrome/app/resources/locale_settings_da.xtb
index ad70ac2..a0ba481 100644
--- a/chrome/app/resources/locale_settings_da.xtb
+++ b/chrome/app/resources/locale_settings_da.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_de.xtb b/chrome/app/resources/locale_settings_de.xtb
index e4f9146..3b5943c 100644
--- a/chrome/app/resources/locale_settings_de.xtb
+++ b/chrome/app/resources/locale_settings_de.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_el.xtb b/chrome/app/resources/locale_settings_el.xtb
index 827eba3..f64c439 100644
--- a/chrome/app/resources/locale_settings_el.xtb
+++ b/chrome/app/resources/locale_settings_el.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_en-GB.xtb b/chrome/app/resources/locale_settings_en-GB.xtb
index 73e9e1f..9a3289c 100644
--- a/chrome/app/resources/locale_settings_en-GB.xtb
+++ b/chrome/app/resources/locale_settings_en-GB.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_es-419.xtb b/chrome/app/resources/locale_settings_es-419.xtb
index b6ba100..22d9c39 100644
--- a/chrome/app/resources/locale_settings_es-419.xtb
+++ b/chrome/app/resources/locale_settings_es-419.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_es.xtb b/chrome/app/resources/locale_settings_es.xtb
index e784ae7..c460b1c 100644
--- a/chrome/app/resources/locale_settings_es.xtb
+++ b/chrome/app/resources/locale_settings_es.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_et.xtb b/chrome/app/resources/locale_settings_et.xtb
index fc53fe6..80432c6 100644
--- a/chrome/app/resources/locale_settings_et.xtb
+++ b/chrome/app/resources/locale_settings_et.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_fi.xtb b/chrome/app/resources/locale_settings_fi.xtb
index 927d2c7..bdf6320 100644
--- a/chrome/app/resources/locale_settings_fi.xtb
+++ b/chrome/app/resources/locale_settings_fi.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_fil.xtb b/chrome/app/resources/locale_settings_fil.xtb
index 9bc14e6..fc94ad8 100644
--- a/chrome/app/resources/locale_settings_fil.xtb
+++ b/chrome/app/resources/locale_settings_fil.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_fr.xtb b/chrome/app/resources/locale_settings_fr.xtb
index d68f2e5..9d3403d 100644
--- a/chrome/app/resources/locale_settings_fr.xtb
+++ b/chrome/app/resources/locale_settings_fr.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_gu.xtb b/chrome/app/resources/locale_settings_gu.xtb
index 4ec86c8..15fb229 100644
--- a/chrome/app/resources/locale_settings_gu.xtb
+++ b/chrome/app/resources/locale_settings_gu.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_he.xtb b/chrome/app/resources/locale_settings_he.xtb
index 4730869..7d572a7 100644
--- a/chrome/app/resources/locale_settings_he.xtb
+++ b/chrome/app/resources/locale_settings_he.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_hi.xtb b/chrome/app/resources/locale_settings_hi.xtb
index 9cfb43f..d17c6d7 100644
--- a/chrome/app/resources/locale_settings_hi.xtb
+++ b/chrome/app/resources/locale_settings_hi.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_hr.xtb b/chrome/app/resources/locale_settings_hr.xtb
index 5b7faed..76aa13d 100644
--- a/chrome/app/resources/locale_settings_hr.xtb
+++ b/chrome/app/resources/locale_settings_hr.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_hu.xtb b/chrome/app/resources/locale_settings_hu.xtb
index c4203ac..8038a5d 100644
--- a/chrome/app/resources/locale_settings_hu.xtb
+++ b/chrome/app/resources/locale_settings_hu.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_id.xtb b/chrome/app/resources/locale_settings_id.xtb
index e61d4e0..08911b7 100644
--- a/chrome/app/resources/locale_settings_id.xtb
+++ b/chrome/app/resources/locale_settings_id.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_it.xtb b/chrome/app/resources/locale_settings_it.xtb
index 41e992f..c0852da 100644
--- a/chrome/app/resources/locale_settings_it.xtb
+++ b/chrome/app/resources/locale_settings_it.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_ja.xtb b/chrome/app/resources/locale_settings_ja.xtb
index 510954e..66eb732 100644
--- a/chrome/app/resources/locale_settings_ja.xtb
+++ b/chrome/app/resources/locale_settings_ja.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_kn.xtb b/chrome/app/resources/locale_settings_kn.xtb
index 05a0fb3..b73dee5 100644
--- a/chrome/app/resources/locale_settings_kn.xtb
+++ b/chrome/app/resources/locale_settings_kn.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_ko.xtb b/chrome/app/resources/locale_settings_ko.xtb
index 2a82300..52ae037 100644
--- a/chrome/app/resources/locale_settings_ko.xtb
+++ b/chrome/app/resources/locale_settings_ko.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_lt.xtb b/chrome/app/resources/locale_settings_lt.xtb
index e31cb91..0f748be 100644
--- a/chrome/app/resources/locale_settings_lt.xtb
+++ b/chrome/app/resources/locale_settings_lt.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_lv.xtb b/chrome/app/resources/locale_settings_lv.xtb
index 4a8e521..3381b59 100644
--- a/chrome/app/resources/locale_settings_lv.xtb
+++ b/chrome/app/resources/locale_settings_lv.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_ml.xtb b/chrome/app/resources/locale_settings_ml.xtb
index bbef046..ce0de38 100644
--- a/chrome/app/resources/locale_settings_ml.xtb
+++ b/chrome/app/resources/locale_settings_ml.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_mr.xtb b/chrome/app/resources/locale_settings_mr.xtb
index 5d56e87..e90056d 100644
--- a/chrome/app/resources/locale_settings_mr.xtb
+++ b/chrome/app/resources/locale_settings_mr.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_nb.xtb b/chrome/app/resources/locale_settings_nb.xtb
index d388495..01b0fb0 100644
--- a/chrome/app/resources/locale_settings_nb.xtb
+++ b/chrome/app/resources/locale_settings_nb.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_nl.xtb b/chrome/app/resources/locale_settings_nl.xtb
index 387609ee..4d1c740 100644
--- a/chrome/app/resources/locale_settings_nl.xtb
+++ b/chrome/app/resources/locale_settings_nl.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_or.xtb b/chrome/app/resources/locale_settings_or.xtb
index 21df7a3..d8caed9 100644
--- a/chrome/app/resources/locale_settings_or.xtb
+++ b/chrome/app/resources/locale_settings_or.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_pl.xtb b/chrome/app/resources/locale_settings_pl.xtb
index 73a6746..e9a1d2f 100644
--- a/chrome/app/resources/locale_settings_pl.xtb
+++ b/chrome/app/resources/locale_settings_pl.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_pt-BR.xtb b/chrome/app/resources/locale_settings_pt-BR.xtb
index 4ef00b7..d4ff6a8 100644
--- a/chrome/app/resources/locale_settings_pt-BR.xtb
+++ b/chrome/app/resources/locale_settings_pt-BR.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_pt-PT.xtb b/chrome/app/resources/locale_settings_pt-PT.xtb
index 1cdac3d..8fe2a12 100644
--- a/chrome/app/resources/locale_settings_pt-PT.xtb
+++ b/chrome/app/resources/locale_settings_pt-PT.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_ro.xtb b/chrome/app/resources/locale_settings_ro.xtb
index c6a1202..9f999c7 100644
--- a/chrome/app/resources/locale_settings_ro.xtb
+++ b/chrome/app/resources/locale_settings_ro.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_ru.xtb b/chrome/app/resources/locale_settings_ru.xtb
index 2d8bc2c..6d549bd 100644
--- a/chrome/app/resources/locale_settings_ru.xtb
+++ b/chrome/app/resources/locale_settings_ru.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_sk.xtb b/chrome/app/resources/locale_settings_sk.xtb
index 5976078..65a8361 100644
--- a/chrome/app/resources/locale_settings_sk.xtb
+++ b/chrome/app/resources/locale_settings_sk.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_sl.xtb b/chrome/app/resources/locale_settings_sl.xtb
index 8aed8b4..baa6d82 100644
--- a/chrome/app/resources/locale_settings_sl.xtb
+++ b/chrome/app/resources/locale_settings_sl.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_sr.xtb b/chrome/app/resources/locale_settings_sr.xtb
index 4a07f91..7d6a16b 100644
--- a/chrome/app/resources/locale_settings_sr.xtb
+++ b/chrome/app/resources/locale_settings_sr.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_sv.xtb b/chrome/app/resources/locale_settings_sv.xtb
index b9e58ab..9ef82d8 100644
--- a/chrome/app/resources/locale_settings_sv.xtb
+++ b/chrome/app/resources/locale_settings_sv.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_ta.xtb b/chrome/app/resources/locale_settings_ta.xtb
index 1054cf54..e1784ff 100644
--- a/chrome/app/resources/locale_settings_ta.xtb
+++ b/chrome/app/resources/locale_settings_ta.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_te.xtb b/chrome/app/resources/locale_settings_te.xtb
index d5c55a3..75c5d92 100644
--- a/chrome/app/resources/locale_settings_te.xtb
+++ b/chrome/app/resources/locale_settings_te.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_th.xtb b/chrome/app/resources/locale_settings_th.xtb
index 67034bd..cb73f69 100644
--- a/chrome/app/resources/locale_settings_th.xtb
+++ b/chrome/app/resources/locale_settings_th.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_tr.xtb b/chrome/app/resources/locale_settings_tr.xtb
index bce37d1..5da43ab 100644
--- a/chrome/app/resources/locale_settings_tr.xtb
+++ b/chrome/app/resources/locale_settings_tr.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_uk.xtb b/chrome/app/resources/locale_settings_uk.xtb
index 579ce6d..2b71ff7 100644
--- a/chrome/app/resources/locale_settings_uk.xtb
+++ b/chrome/app/resources/locale_settings_uk.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_vi.xtb b/chrome/app/resources/locale_settings_vi.xtb
index 839c99d..7ab0c90 100644
--- a/chrome/app/resources/locale_settings_vi.xtb
+++ b/chrome/app/resources/locale_settings_vi.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_zh-CN.xtb b/chrome/app/resources/locale_settings_zh-CN.xtb
index 2120efc..7d7a163 100644
--- a/chrome/app/resources/locale_settings_zh-CN.xtb
+++ b/chrome/app/resources/locale_settings_zh-CN.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_zh-TW.xtb b/chrome/app/resources/locale_settings_zh-TW.xtb
index c3fe3cf..13b584d 100644
--- a/chrome/app/resources/locale_settings_zh-TW.xtb
+++ b/chrome/app/resources/locale_settings_zh-TW.xtb
@@ -65,8 +65,8 @@
 <translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
 <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">30</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15.5</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
 <translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
 </translationbundle>
diff --git a/chrome/browser/views/sync/sync_setup_flow.cc b/chrome/browser/views/sync/sync_setup_flow.cc
index a765a0c..7019c39 100644
--- a/chrome/browser/views/sync/sync_setup_flow.cc
+++ b/chrome/browser/views/sync/sync_setup_flow.cc
@@ -6,6 +6,7 @@
 
 #include "chrome/browser/views/sync/sync_setup_flow.h"
 
+#include "app/gfx/font.h"
 #include "base/histogram.h"
 #include "base/json_reader.h"
 #include "base/json_writer.h"
@@ -17,6 +18,7 @@
 #include "chrome/browser/sync/auth_error_state.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/common/pref_names.h"
 #include "grit/locale_settings.h"
 #include "views/window/window.h"
 
@@ -133,9 +135,16 @@ SyncSetupFlow::~SyncSetupFlow() {
 }
 
 void SyncSetupFlow::GetDialogSize(gfx::Size* size) const {
-  gfx::Size s(views::Window::GetLocalizedContentsSize(
+  PrefService* prefs = service_->profile()->GetPrefs();
+  gfx::Font approximate_web_font = gfx::Font::CreateFont(
+      prefs->GetString(prefs::kWebKitSansSerifFontFamily),
+      prefs->GetInteger(prefs::kWebKitDefaultFontSize));
+
+  gfx::Size s = views::Window::GetLocalizedContentsSizeForFont(
       IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS,
-      IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES));
+      IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES,
+      approximate_web_font);
+
   size->set_width(s.width());
   size->set_height(s.height());
 }
diff --git a/chrome/browser/views/sync/sync_setup_wizard.cc b/chrome/browser/views/sync/sync_setup_wizard.cc
index f89fe12..5e46382 100644
--- a/chrome/browser/views/sync/sync_setup_wizard.cc
+++ b/chrome/browser/views/sync/sync_setup_wizard.cc
@@ -122,7 +122,8 @@ void SyncResourcesSource::StartDataRequest(const std::string& path_raw,
 }
 
 SyncSetupWizard::SyncSetupWizard(ProfileSyncService* service)
-      : service_(service), flow_container_(new SyncSetupFlowContainer()) {
+    : service_(service),
+      flow_container_(new SyncSetupFlowContainer()) {
   // Register data sources for HTML content we require.
   // g_browser_process and/or io_thread may not exist during testing.
   if (g_browser_process && g_browser_process->io_thread()) {
diff --git a/views/window/window.cc b/views/window/window.cc
index f2a1501..9f69172 100644
--- a/views/window/window.cc
+++ b/views/window/window.cc
@@ -14,28 +14,45 @@
 namespace views {
 
 // static
-int Window::GetLocalizedContentsWidth(int col_resource_id) {
+int Window::GetLocalizedContentsWidthForFont(int col_resource_id,
+                                             const gfx::Font& font) {
   double chars = 0;
   StringToDouble(WideToUTF8(l10n_util::GetString(col_resource_id)), &chars);
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  gfx::Font font = rb.GetFont(ResourceBundle::BaseFont);
   int width = font.GetExpectedTextWidth(static_cast<int>(chars));
   DCHECK(width > 0);
   return width;
 }
 
 // static
-int Window::GetLocalizedContentsHeight(int row_resource_id) {
+int Window::GetLocalizedContentsWidth(int col_resource_id) {
+  return GetLocalizedContentsWidthForFont(col_resource_id,
+      ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont));
+}
+
+// static
+int Window::GetLocalizedContentsHeightForFont(int row_resource_id,
+                                              const gfx::Font& font) {
   double lines = 0;
   StringToDouble(WideToUTF8(l10n_util::GetString(row_resource_id)), &lines);
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  gfx::Font font = rb.GetFont(ResourceBundle::BaseFont);
   int height = static_cast<int>(font.height() * lines);
   DCHECK(height > 0);
   return height;
 }
 
 // static
+int Window::GetLocalizedContentsHeight(int row_resource_id) {
+  return GetLocalizedContentsHeightForFont(row_resource_id,
+      ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont));
+}
+
+gfx::Size Window::GetLocalizedContentsSizeForFont(int col_resource_id,
+                                                  int row_resource_id,
+                                                  const gfx::Font& font) {
+  return gfx::Size(GetLocalizedContentsWidthForFont(col_resource_id, font),
+                   GetLocalizedContentsHeightForFont(row_resource_id, font));
+}
+
+// static
 gfx::Size Window::GetLocalizedContentsSize(int col_resource_id,
                                            int row_resource_id) {
   return gfx::Size(GetLocalizedContentsWidth(col_resource_id),
diff --git a/views/window/window.h b/views/window/window.h
index 8983972..6bb1075 100644
--- a/views/window/window.h
+++ b/views/window/window.h
@@ -8,6 +8,7 @@
 #include "base/gfx/native_widget_types.h"
 
 namespace gfx {
+class Font;
 class Rect;
 class Size;
 }
@@ -42,6 +43,16 @@ class Window {
   static gfx::Size GetLocalizedContentsSize(int col_resource_id,
                                             int row_resource_id);
 
+  // These versions of GetLocalizedContents allow a font to be specified
+  // other than the default UI font.
+  static int GetLocalizedContentsWidthForFont(int col_resource_id,
+                                              const gfx::Font& font);
+  static int GetLocalizedContentsHeightForFont(int row_resource_id,
+                                               const gfx::Font& font);
+  static gfx::Size GetLocalizedContentsSizeForFont(int col_resource_id,
+                                                   int row_resource_id,
+                                                   const gfx::Font& font);
+
   // Closes all windows that aren't identified as "app windows" via
   // IsAppWindow. Called during application shutdown when the last "app window"
   // is closed.