Fix Large Font issues in About box (issue 2458).

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

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

50 files changed, 151 insertions, 108 deletions

diff --git a/chrome/app/locales/locale_settings.h b/chrome/app/locales/locale_settings.h
index 09f5d53..55400a0 100644
--- a/chrome/app/locales/locale_settings.h
+++ b/chrome/app/locales/locale_settings.h
@@ -86,7 +86,7 @@
 // The width and height of the About dialog box in characters and lines (See
 // above).
 #define IDS_ABOUT_DIALOG_WIDTH_CHARS 1031
-#define IDS_ABOUT_DIALOG_HEIGHT_LINES 1032
+#define IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES 1032
 
 // The width and height of the Fonts and Languages dialog box in characters and
 // lines (See above).
diff --git a/chrome/app/resources/locale_settings_ar.rc b/chrome/app/resources/locale_settings_ar.rc
index e807f58..7581e4a 100644
--- a/chrome/app/resources/locale_settings_ar.rc
+++ b/chrome/app/resources/locale_settings_ar.rc
@@ -30,8 +30,8 @@ BEGIN
   IDS_CLEARDATA_DIALOG_HEIGHT_LINES "14.5"
   IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
   IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
-  IDS_ABOUT_DIALOG_WIDTH_CHARS "75"
-  IDS_ABOUT_DIALOG_HEIGHT_LINES "4"
+  IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+  IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "4"
   IDS_FONTSLANG_DIALOG_WIDTH_CHARS "95"
   IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
   IDS_FONTSLANG_LABEL_WIDTH "17"
diff --git a/chrome/app/resources/locale_settings_bg.rc b/chrome/app/resources/locale_settings_bg.rc
index 8a5d4c6..12500ef 100644
--- a/chrome/app/resources/locale_settings_bg.rc
+++ b/chrome/app/resources/locale_settings_bg.rc
@@ -29,8 +29,8 @@ BEGIN
   IDS_CLEARDATA_DIALOG_HEIGHT_LINES "14.5"
   IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
   IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
-  IDS_ABOUT_DIALOG_WIDTH_CHARS "75"
-  IDS_ABOUT_DIALOG_HEIGHT_LINES "5"
+  IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+  IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "5"
   IDS_FONTSLANG_DIALOG_WIDTH_CHARS "99"
   IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
   IDS_FONTSLANG_LABEL_WIDTH "20"
diff --git a/chrome/app/resources/locale_settings_ca.rc b/chrome/app/resources/locale_settings_ca.rc
index a3b7a23..9ff0599 100644
--- a/chrome/app/resources/locale_settings_ca.rc
+++ b/chrome/app/resources/locale_settings_ca.rc
@@ -29,8 +29,8 @@ BEGIN
   IDS_CLEARDATA_DIALOG_HEIGHT_LINES "14.5"
   IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
   IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
-  IDS_ABOUT_DIALOG_WIDTH_CHARS "75"
-  IDS_ABOUT_DIALOG_HEIGHT_LINES "5"
+  IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+  IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "5"
   IDS_FONTSLANG_DIALOG_WIDTH_CHARS "98"
   IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
   IDS_FONTSLANG_LABEL_WIDTH "20"
diff --git a/chrome/app/resources/locale_settings_cs.rc b/chrome/app/resources/locale_settings_cs.rc
index 94ad9eb..da34bae 100644
--- a/chrome/app/resources/locale_settings_cs.rc
+++ b/chrome/app/resources/locale_settings_cs.rc
@@ -29,8 +29,8 @@ BEGIN
   IDS_CLEARDATA_DIALOG_HEIGHT_LINES "14.5"
   IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
   IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
-  IDS_ABOUT_DIALOG_WIDTH_CHARS "75"
-  IDS_ABOUT_DIALOG_HEIGHT_LINES "4"
+  IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+  IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "4"
   IDS_FONTSLANG_DIALOG_WIDTH_CHARS "98"
   IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
   IDS_FONTSLANG_LABEL_WIDTH "20"
diff --git a/chrome/app/resources/locale_settings_da.rc b/chrome/app/resources/locale_settings_da.rc
index 1a00a789..c7bf9a1 100644
--- a/chrome/app/resources/locale_settings_da.rc
+++ b/chrome/app/resources/locale_settings_da.rc
@@ -29,8 +29,8 @@ BEGIN
   IDS_CLEARDATA_DIALOG_HEIGHT_LINES "14.5"
   IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
   IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
-  IDS_ABOUT_DIALOG_WIDTH_CHARS "75"
-  IDS_ABOUT_DIALOG_HEIGHT_LINES "4"
+  IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+  IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "4"
   IDS_FONTSLANG_DIALOG_WIDTH_CHARS "98"
   IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
   IDS_FONTSLANG_LABEL_WIDTH "20"
diff --git a/chrome/app/resources/locale_settings_de.rc b/chrome/app/resources/locale_settings_de.rc
index 276770c..82bd540 100644
--- a/chrome/app/resources/locale_settings_de.rc
+++ b/chrome/app/resources/locale_settings_de.rc
@@ -29,8 +29,8 @@ BEGIN
   IDS_CLEARDATA_DIALOG_HEIGHT_LINES "14.5"
   IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
   IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
-  IDS_ABOUT_DIALOG_WIDTH_CHARS "75"
-  IDS_ABOUT_DIALOG_HEIGHT_LINES "5"
+  IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+  IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "5"
   IDS_FONTSLANG_DIALOG_WIDTH_CHARS "98"
   IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
   IDS_FONTSLANG_LABEL_WIDTH "20"
diff --git a/chrome/app/resources/locale_settings_el.rc b/chrome/app/resources/locale_settings_el.rc
index 108f51f..14b9ee0 100644
--- a/chrome/app/resources/locale_settings_el.rc
+++ b/chrome/app/resources/locale_settings_el.rc
@@ -29,8 +29,8 @@ BEGIN
   IDS_CLEARDATA_DIALOG_HEIGHT_LINES "14.5"
   IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
   IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
-  IDS_ABOUT_DIALOG_WIDTH_CHARS "75"
-  IDS_ABOUT_DIALOG_HEIGHT_LINES "6"
+  IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+  IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "6"
   IDS_FONTSLANG_DIALOG_WIDTH_CHARS "98"
   IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
   IDS_FONTSLANG_LABEL_WIDTH "20"
diff --git a/chrome/app/resources/locale_settings_en-GB.rc b/chrome/app/resources/locale_settings_en-GB.rc
index 2820111..1cfb108 100644
--- a/chrome/app/resources/locale_settings_en-GB.rc
+++ b/chrome/app/resources/locale_settings_en-GB.rc
@@ -29,8 +29,8 @@ BEGIN
   IDS_CLEARDATA_DIALOG_HEIGHT_LINES "14.5"
   IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
   IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
-  IDS_ABOUT_DIALOG_WIDTH_CHARS "75"
-  IDS_ABOUT_DIALOG_HEIGHT_LINES "4"
+  IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+  IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "4"
   IDS_FONTSLANG_DIALOG_WIDTH_CHARS "96"
   IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
   IDS_FONTSLANG_LABEL_WIDTH "18"
diff --git a/chrome/app/resources/locale_settings_en-US.rc b/chrome/app/resources/locale_settings_en-US.rc
index 88116ab..397b32a 100644
--- a/chrome/app/resources/locale_settings_en-US.rc
+++ b/chrome/app/resources/locale_settings_en-US.rc
@@ -29,8 +29,8 @@ BEGIN
   IDS_CLEARDATA_DIALOG_HEIGHT_LINES "15.5"
   IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
   IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
-  IDS_ABOUT_DIALOG_WIDTH_CHARS "75"
-  IDS_ABOUT_DIALOG_HEIGHT_LINES "4"
+  IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+  IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "4"
   IDS_FONTSLANG_DIALOG_WIDTH_CHARS "96"
   IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
   IDS_FONTSLANG_LABEL_WIDTH "18"
diff --git a/chrome/app/resources/locale_settings_es-419.rc b/chrome/app/resources/locale_settings_es-419.rc
index 36ecd31..f5af996 100644
--- a/chrome/app/resources/locale_settings_es-419.rc
+++ b/chrome/app/resources/locale_settings_es-419.rc
@@ -29,8 +29,8 @@ BEGIN
   IDS_CLEARDATA_DIALOG_HEIGHT_LINES "14.5"
   IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
   IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
-  IDS_ABOUT_DIALOG_WIDTH_CHARS "75"
-  IDS_ABOUT_DIALOG_HEIGHT_LINES "4"
+  IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+  IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "4"
   IDS_FONTSLANG_DIALOG_WIDTH_CHARS "99"
   IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
   IDS_FONTSLANG_LABEL_WIDTH "20"
diff --git a/chrome/app/resources/locale_settings_es.rc b/chrome/app/resources/locale_settings_es.rc
index 7fbda2b..c308cea 100644
--- a/chrome/app/resources/locale_settings_es.rc
+++ b/chrome/app/resources/locale_settings_es.rc
@@ -29,8 +29,8 @@ BEGIN
   IDS_CLEARDATA_DIALOG_HEIGHT_LINES "14.5"
   IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
   IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
-  IDS_ABOUT_DIALOG_WIDTH_CHARS "75"
-  IDS_ABOUT_DIALOG_HEIGHT_LINES "4"
+  IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+  IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "4"
   IDS_FONTSLANG_DIALOG_WIDTH_CHARS "99"
   IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
   IDS_FONTSLANG_LABEL_WIDTH "20"
diff --git a/chrome/app/resources/locale_settings_et.rc b/chrome/app/resources/locale_settings_et.rc
index df5c474..383d0f4 100644
--- a/chrome/app/resources/locale_settings_et.rc
+++ b/chrome/app/resources/locale_settings_et.rc
@@ -29,8 +29,8 @@ BEGIN
   IDS_CLEARDATA_DIALOG_HEIGHT_LINES "14.5"
   IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
   IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
-  IDS_ABOUT_DIALOG_WIDTH_CHARS "75"
-  IDS_ABOUT_DIALOG_HEIGHT_LINES "4"
+  IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+  IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "4"
   IDS_FONTSLANG_DIALOG_WIDTH_CHARS "99"
   IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
   IDS_FONTSLANG_LABEL_WIDTH "20"
diff --git a/chrome/app/resources/locale_settings_fi.rc b/chrome/app/resources/locale_settings_fi.rc
index 2de2d58d..862b6fe 100644
--- a/chrome/app/resources/locale_settings_fi.rc
+++ b/chrome/app/resources/locale_settings_fi.rc
@@ -29,8 +29,8 @@ BEGIN
   IDS_CLEARDATA_DIALOG_HEIGHT_LINES "14.5"
   IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
   IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
-  IDS_ABOUT_DIALOG_WIDTH_CHARS "75"
-  IDS_ABOUT_DIALOG_HEIGHT_LINES "5"
+  IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+  IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "5"
   IDS_FONTSLANG_DIALOG_WIDTH_CHARS "97"
   IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
   IDS_FONTSLANG_LABEL_WIDTH "19"
diff --git a/chrome/app/resources/locale_settings_fil.rc b/chrome/app/resources/locale_settings_fil.rc
index 78730dd..4c04b9d 100644
--- a/chrome/app/resources/locale_settings_fil.rc
+++ b/chrome/app/resources/locale_settings_fil.rc
@@ -29,8 +29,8 @@ BEGIN
   IDS_CLEARDATA_DIALOG_HEIGHT_LINES "14.5"
   IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
   IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
-  IDS_ABOUT_DIALOG_WIDTH_CHARS "75"
-  IDS_ABOUT_DIALOG_HEIGHT_LINES "5"
+  IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+  IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "5"
   IDS_FONTSLANG_DIALOG_WIDTH_CHARS "97"
   IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
   IDS_FONTSLANG_LABEL_WIDTH "18"
diff --git a/chrome/app/resources/locale_settings_fr.rc b/chrome/app/resources/locale_settings_fr.rc
index 06528e8..3f4e017 100644
--- a/chrome/app/resources/locale_settings_fr.rc
+++ b/chrome/app/resources/locale_settings_fr.rc
@@ -29,8 +29,8 @@ BEGIN
   IDS_CLEARDATA_DIALOG_HEIGHT_LINES "14.5"
   IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
   IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
-  IDS_ABOUT_DIALOG_WIDTH_CHARS "75"
-  IDS_ABOUT_DIALOG_HEIGHT_LINES "5"
+  IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+  IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "5"
   IDS_FONTSLANG_DIALOG_WIDTH_CHARS "97"
   IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
   IDS_FONTSLANG_LABEL_WIDTH "18"
diff --git a/chrome/app/resources/locale_settings_he.rc b/chrome/app/resources/locale_settings_he.rc
index 3835671..f755267 100644
--- a/chrome/app/resources/locale_settings_he.rc
+++ b/chrome/app/resources/locale_settings_he.rc
@@ -29,8 +29,8 @@ BEGIN
   IDS_CLEARDATA_DIALOG_HEIGHT_LINES "14.5"
   IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
   IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
-  IDS_ABOUT_DIALOG_WIDTH_CHARS "75"
-  IDS_ABOUT_DIALOG_HEIGHT_LINES "4"
+  IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+  IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "4"
   IDS_FONTSLANG_DIALOG_WIDTH_CHARS "97"
   IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
   IDS_FONTSLANG_LABEL_WIDTH "18"
diff --git a/chrome/app/resources/locale_settings_hi.rc b/chrome/app/resources/locale_settings_hi.rc
index b52b597..56eba16 100644
--- a/chrome/app/resources/locale_settings_hi.rc
+++ b/chrome/app/resources/locale_settings_hi.rc
@@ -29,8 +29,8 @@ BEGIN
   IDS_CLEARDATA_DIALOG_HEIGHT_LINES "14.5"
   IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
   IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
-  IDS_ABOUT_DIALOG_WIDTH_CHARS "75"
-  IDS_ABOUT_DIALOG_HEIGHT_LINES "5"
+  IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+  IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "5"
   IDS_FONTSLANG_DIALOG_WIDTH_CHARS "110"
   IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
   IDS_FONTSLANG_LABEL_WIDTH "20"
diff --git a/chrome/app/resources/locale_settings_hr.rc b/chrome/app/resources/locale_settings_hr.rc
index f4156e0..2a471bf 100644
--- a/chrome/app/resources/locale_settings_hr.rc
+++ b/chrome/app/resources/locale_settings_hr.rc
@@ -29,8 +29,8 @@ BEGIN
   IDS_CLEARDATA_DIALOG_HEIGHT_LINES "14.5"
   IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
   IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
-  IDS_ABOUT_DIALOG_WIDTH_CHARS "75"
-  IDS_ABOUT_DIALOG_HEIGHT_LINES "4"
+  IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+  IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "4"
   IDS_FONTSLANG_DIALOG_WIDTH_CHARS "99"
   IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
   IDS_FONTSLANG_LABEL_WIDTH "20"
diff --git a/chrome/app/resources/locale_settings_hu.rc b/chrome/app/resources/locale_settings_hu.rc
index c07ec97..059506c 100644
--- a/chrome/app/resources/locale_settings_hu.rc
+++ b/chrome/app/resources/locale_settings_hu.rc
@@ -29,8 +29,8 @@ BEGIN
   IDS_CLEARDATA_DIALOG_HEIGHT_LINES "14.5"
   IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
   IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
-  IDS_ABOUT_DIALOG_WIDTH_CHARS "75"
-  IDS_ABOUT_DIALOG_HEIGHT_LINES "4"
+  IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+  IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "4"
   IDS_FONTSLANG_DIALOG_WIDTH_CHARS "100"
   IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
   IDS_FONTSLANG_LABEL_WIDTH "20"
diff --git a/chrome/app/resources/locale_settings_id.rc b/chrome/app/resources/locale_settings_id.rc
index d6cf2b3..65f3e64 100644
--- a/chrome/app/resources/locale_settings_id.rc
+++ b/chrome/app/resources/locale_settings_id.rc
@@ -29,8 +29,8 @@ BEGIN
   IDS_CLEARDATA_DIALOG_HEIGHT_LINES "14.5"
   IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
   IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
-  IDS_ABOUT_DIALOG_WIDTH_CHARS "75"
-  IDS_ABOUT_DIALOG_HEIGHT_LINES "4"
+  IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+  IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "4"
   IDS_FONTSLANG_DIALOG_WIDTH_CHARS "98"
   IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
   IDS_FONTSLANG_LABEL_WIDTH "20"
diff --git a/chrome/app/resources/locale_settings_it.rc b/chrome/app/resources/locale_settings_it.rc
index f10ac25..da184e6 100644
--- a/chrome/app/resources/locale_settings_it.rc
+++ b/chrome/app/resources/locale_settings_it.rc
@@ -29,8 +29,8 @@ BEGIN
   IDS_CLEARDATA_DIALOG_HEIGHT_LINES "14.5"
   IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
   IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
-  IDS_ABOUT_DIALOG_WIDTH_CHARS "75"
-  IDS_ABOUT_DIALOG_HEIGHT_LINES "5"
+  IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+  IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "5"
   IDS_FONTSLANG_DIALOG_WIDTH_CHARS "95"
   IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
   IDS_FONTSLANG_LABEL_WIDTH "17"
diff --git a/chrome/app/resources/locale_settings_ja.rc b/chrome/app/resources/locale_settings_ja.rc
index f45517c..22dc046 100644
--- a/chrome/app/resources/locale_settings_ja.rc
+++ b/chrome/app/resources/locale_settings_ja.rc
@@ -29,8 +29,8 @@ BEGIN
   IDS_CLEARDATA_DIALOG_HEIGHT_LINES "14.5"
   IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
   IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
-  IDS_ABOUT_DIALOG_WIDTH_CHARS "75"
-  IDS_ABOUT_DIALOG_HEIGHT_LINES "4"
+  IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+  IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "4"
   IDS_FONTSLANG_DIALOG_WIDTH_CHARS "102"
   IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
   IDS_FONTSLANG_LABEL_WIDTH "18"
diff --git a/chrome/app/resources/locale_settings_ko.rc b/chrome/app/resources/locale_settings_ko.rc
index 278f03e..9af15c1 100644
--- a/chrome/app/resources/locale_settings_ko.rc
+++ b/chrome/app/resources/locale_settings_ko.rc
@@ -29,8 +29,8 @@ BEGIN
   IDS_CLEARDATA_DIALOG_HEIGHT_LINES "14.5"
   IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
   IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
-  IDS_ABOUT_DIALOG_WIDTH_CHARS "75"
-  IDS_ABOUT_DIALOG_HEIGHT_LINES "7"
+  IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+  IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "7"
   IDS_FONTSLANG_DIALOG_WIDTH_CHARS "95"
   IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
   IDS_FONTSLANG_LABEL_WIDTH "16"
diff --git a/chrome/app/resources/locale_settings_lt.rc b/chrome/app/resources/locale_settings_lt.rc
index 0de1903..30e6837 100644
--- a/chrome/app/resources/locale_settings_lt.rc
+++ b/chrome/app/resources/locale_settings_lt.rc
@@ -29,8 +29,8 @@ BEGIN
   IDS_CLEARDATA_DIALOG_HEIGHT_LINES "14.5"
   IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
   IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
-  IDS_ABOUT_DIALOG_WIDTH_CHARS "75"
-  IDS_ABOUT_DIALOG_HEIGHT_LINES "4"
+  IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+  IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "4"
   IDS_FONTSLANG_DIALOG_WIDTH_CHARS "99"
   IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
   IDS_FONTSLANG_LABEL_WIDTH "20"
diff --git a/chrome/app/resources/locale_settings_lv.rc b/chrome/app/resources/locale_settings_lv.rc
index 8e1c3f3..e60f3ee 100644
--- a/chrome/app/resources/locale_settings_lv.rc
+++ b/chrome/app/resources/locale_settings_lv.rc
@@ -29,8 +29,8 @@ BEGIN
   IDS_CLEARDATA_DIALOG_HEIGHT_LINES "14.5"
   IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
   IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
-  IDS_ABOUT_DIALOG_WIDTH_CHARS "75"
-  IDS_ABOUT_DIALOG_HEIGHT_LINES "5"
+  IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+  IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "5"
   IDS_FONTSLANG_DIALOG_WIDTH_CHARS "97"
   IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
   IDS_FONTSLANG_LABEL_WIDTH "18"
diff --git a/chrome/app/resources/locale_settings_nb.rc b/chrome/app/resources/locale_settings_nb.rc
index 146200b..9293e4c 100644
--- a/chrome/app/resources/locale_settings_nb.rc
+++ b/chrome/app/resources/locale_settings_nb.rc
@@ -29,8 +29,8 @@ BEGIN
   IDS_CLEARDATA_DIALOG_HEIGHT_LINES "14.5"
   IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
   IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
-  IDS_ABOUT_DIALOG_WIDTH_CHARS "75"
-  IDS_ABOUT_DIALOG_HEIGHT_LINES "4"
+  IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+  IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "4"
   IDS_FONTSLANG_DIALOG_WIDTH_CHARS "95"
   IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
   IDS_FONTSLANG_LABEL_WIDTH "16"
diff --git a/chrome/app/resources/locale_settings_nl.rc b/chrome/app/resources/locale_settings_nl.rc
index 3adf860..a00f015 100644
--- a/chrome/app/resources/locale_settings_nl.rc
+++ b/chrome/app/resources/locale_settings_nl.rc
@@ -29,8 +29,8 @@ BEGIN
   IDS_CLEARDATA_DIALOG_HEIGHT_LINES "14.5"
   IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
   IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
-  IDS_ABOUT_DIALOG_WIDTH_CHARS "75"
-  IDS_ABOUT_DIALOG_HEIGHT_LINES "4"
+  IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+  IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "4"
   IDS_FONTSLANG_DIALOG_WIDTH_CHARS "99"
   IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
   IDS_FONTSLANG_LABEL_WIDTH "21"
diff --git a/chrome/app/resources/locale_settings_pl.rc b/chrome/app/resources/locale_settings_pl.rc
index fa18c28..05a9aa6 100644
--- a/chrome/app/resources/locale_settings_pl.rc
+++ b/chrome/app/resources/locale_settings_pl.rc
@@ -29,8 +29,8 @@ BEGIN
   IDS_CLEARDATA_DIALOG_HEIGHT_LINES "14.5"
   IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
   IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
-  IDS_ABOUT_DIALOG_WIDTH_CHARS "75"
-  IDS_ABOUT_DIALOG_HEIGHT_LINES "5"
+  IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+  IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "5"
   IDS_FONTSLANG_DIALOG_WIDTH_CHARS "98"
   IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
   IDS_FONTSLANG_LABEL_WIDTH "20"
diff --git a/chrome/app/resources/locale_settings_pt-BR.rc b/chrome/app/resources/locale_settings_pt-BR.rc
index ba615a5..edcc8d3 100644
--- a/chrome/app/resources/locale_settings_pt-BR.rc
+++ b/chrome/app/resources/locale_settings_pt-BR.rc
@@ -29,8 +29,8 @@ BEGIN
   IDS_CLEARDATA_DIALOG_HEIGHT_LINES "14.5"
   IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
   IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
-  IDS_ABOUT_DIALOG_WIDTH_CHARS "75"
-  IDS_ABOUT_DIALOG_HEIGHT_LINES "4"
+  IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+  IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "4"
   IDS_FONTSLANG_DIALOG_WIDTH_CHARS "97"
   IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
   IDS_FONTSLANG_LABEL_WIDTH "19"
diff --git a/chrome/app/resources/locale_settings_pt-PT.rc b/chrome/app/resources/locale_settings_pt-PT.rc
index 01a90dc..45a0eb1 100644
--- a/chrome/app/resources/locale_settings_pt-PT.rc
+++ b/chrome/app/resources/locale_settings_pt-PT.rc
@@ -29,8 +29,8 @@ BEGIN
   IDS_CLEARDATA_DIALOG_HEIGHT_LINES "14.5"
   IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
   IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
-  IDS_ABOUT_DIALOG_WIDTH_CHARS "75"
-  IDS_ABOUT_DIALOG_HEIGHT_LINES "4"
+  IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+  IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "4"
   IDS_FONTSLANG_DIALOG_WIDTH_CHARS "97"
   IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
   IDS_FONTSLANG_LABEL_WIDTH "18"
diff --git a/chrome/app/resources/locale_settings_ro.rc b/chrome/app/resources/locale_settings_ro.rc
index feb2c27..87ac6f8 100644
--- a/chrome/app/resources/locale_settings_ro.rc
+++ b/chrome/app/resources/locale_settings_ro.rc
@@ -29,8 +29,8 @@ BEGIN
   IDS_CLEARDATA_DIALOG_HEIGHT_LINES "14.5"
   IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
   IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
-  IDS_ABOUT_DIALOG_WIDTH_CHARS "75"
-  IDS_ABOUT_DIALOG_HEIGHT_LINES "5"
+  IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+  IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "5"
   IDS_FONTSLANG_DIALOG_WIDTH_CHARS "99"
   IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
   IDS_FONTSLANG_LABEL_WIDTH "19"
diff --git a/chrome/app/resources/locale_settings_ru.rc b/chrome/app/resources/locale_settings_ru.rc
index 5fbd052..21341ea 100644
--- a/chrome/app/resources/locale_settings_ru.rc
+++ b/chrome/app/resources/locale_settings_ru.rc
@@ -29,8 +29,8 @@ BEGIN
   IDS_CLEARDATA_DIALOG_HEIGHT_LINES "14.5"
   IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
   IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
-  IDS_ABOUT_DIALOG_WIDTH_CHARS "75"
-  IDS_ABOUT_DIALOG_HEIGHT_LINES "6"
+  IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+  IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "6"
   IDS_FONTSLANG_DIALOG_WIDTH_CHARS "99"
   IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
   IDS_FONTSLANG_LABEL_WIDTH "19"
diff --git a/chrome/app/resources/locale_settings_sk.rc b/chrome/app/resources/locale_settings_sk.rc
index 0c57492..f1f9ab6 100644
--- a/chrome/app/resources/locale_settings_sk.rc
+++ b/chrome/app/resources/locale_settings_sk.rc
@@ -29,8 +29,8 @@ BEGIN
   IDS_CLEARDATA_DIALOG_HEIGHT_LINES "14.5"
   IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
   IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
-  IDS_ABOUT_DIALOG_WIDTH_CHARS "75"
-  IDS_ABOUT_DIALOG_HEIGHT_LINES "5"
+  IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+  IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "5"
   IDS_FONTSLANG_DIALOG_WIDTH_CHARS "97"
   IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
   IDS_FONTSLANG_LABEL_WIDTH "18"
diff --git a/chrome/app/resources/locale_settings_sl.rc b/chrome/app/resources/locale_settings_sl.rc
index 221d46a..f66d727 100644
--- a/chrome/app/resources/locale_settings_sl.rc
+++ b/chrome/app/resources/locale_settings_sl.rc
@@ -29,8 +29,8 @@ BEGIN
   IDS_CLEARDATA_DIALOG_HEIGHT_LINES "14.5"
   IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
   IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
-  IDS_ABOUT_DIALOG_WIDTH_CHARS "75"
-  IDS_ABOUT_DIALOG_HEIGHT_LINES "4"
+  IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+  IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "4"
   IDS_FONTSLANG_DIALOG_WIDTH_CHARS "98"
   IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
   IDS_FONTSLANG_LABEL_WIDTH "18"
diff --git a/chrome/app/resources/locale_settings_sr.rc b/chrome/app/resources/locale_settings_sr.rc
index 362c53c..55a30d5 100644
--- a/chrome/app/resources/locale_settings_sr.rc
+++ b/chrome/app/resources/locale_settings_sr.rc
@@ -29,8 +29,8 @@ BEGIN
   IDS_CLEARDATA_DIALOG_HEIGHT_LINES "14.5"
   IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
   IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
-  IDS_ABOUT_DIALOG_WIDTH_CHARS "75"
-  IDS_ABOUT_DIALOG_HEIGHT_LINES "4"
+  IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+  IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "4"
   IDS_FONTSLANG_DIALOG_WIDTH_CHARS "97"
   IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
   IDS_FONTSLANG_LABEL_WIDTH "18"
diff --git a/chrome/app/resources/locale_settings_sv.rc b/chrome/app/resources/locale_settings_sv.rc
index 405fa176..183eb9e 100644
--- a/chrome/app/resources/locale_settings_sv.rc
+++ b/chrome/app/resources/locale_settings_sv.rc
@@ -29,8 +29,8 @@ BEGIN
   IDS_CLEARDATA_DIALOG_HEIGHT_LINES "14.5"
   IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
   IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
-  IDS_ABOUT_DIALOG_WIDTH_CHARS "75"
-  IDS_ABOUT_DIALOG_HEIGHT_LINES "4"
+  IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+  IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "4"
   IDS_FONTSLANG_DIALOG_WIDTH_CHARS "98"
   IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
   IDS_FONTSLANG_LABEL_WIDTH "20"
diff --git a/chrome/app/resources/locale_settings_th.rc b/chrome/app/resources/locale_settings_th.rc
index 31f2b92..81cf895 100644
--- a/chrome/app/resources/locale_settings_th.rc
+++ b/chrome/app/resources/locale_settings_th.rc
@@ -29,8 +29,8 @@ BEGIN
   IDS_CLEARDATA_DIALOG_HEIGHT_LINES "14.5"
   IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
   IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
-  IDS_ABOUT_DIALOG_WIDTH_CHARS "75"
-  IDS_ABOUT_DIALOG_HEIGHT_LINES "4"
+  IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+  IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "4"
   IDS_FONTSLANG_DIALOG_WIDTH_CHARS "97"
   IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
   IDS_FONTSLANG_LABEL_WIDTH "19"
diff --git a/chrome/app/resources/locale_settings_tr.rc b/chrome/app/resources/locale_settings_tr.rc
index 7924455..9d5cdb3 100644
--- a/chrome/app/resources/locale_settings_tr.rc
+++ b/chrome/app/resources/locale_settings_tr.rc
@@ -29,8 +29,8 @@ BEGIN
   IDS_CLEARDATA_DIALOG_HEIGHT_LINES "14.5"
   IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
   IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
-  IDS_ABOUT_DIALOG_WIDTH_CHARS "75"
-  IDS_ABOUT_DIALOG_HEIGHT_LINES "5"
+  IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+  IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "5"
   IDS_FONTSLANG_DIALOG_WIDTH_CHARS "99"
   IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
   IDS_FONTSLANG_LABEL_WIDTH "20"
diff --git a/chrome/app/resources/locale_settings_uk.rc b/chrome/app/resources/locale_settings_uk.rc
index 8f82270..5d7d5c4 100644
--- a/chrome/app/resources/locale_settings_uk.rc
+++ b/chrome/app/resources/locale_settings_uk.rc
@@ -29,8 +29,8 @@ BEGIN
   IDS_CLEARDATA_DIALOG_HEIGHT_LINES "14.5"
   IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
   IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
-  IDS_ABOUT_DIALOG_WIDTH_CHARS "75"
-  IDS_ABOUT_DIALOG_HEIGHT_LINES "5"
+  IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+  IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "5"
   IDS_FONTSLANG_DIALOG_WIDTH_CHARS "97"
   IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
   IDS_FONTSLANG_LABEL_WIDTH "19"
diff --git a/chrome/app/resources/locale_settings_vi.rc b/chrome/app/resources/locale_settings_vi.rc
index 5f2747a..e37abba 100644
--- a/chrome/app/resources/locale_settings_vi.rc
+++ b/chrome/app/resources/locale_settings_vi.rc
@@ -29,8 +29,8 @@ BEGIN
   IDS_CLEARDATA_DIALOG_HEIGHT_LINES "14.5"
   IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
   IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
-  IDS_ABOUT_DIALOG_WIDTH_CHARS "75"
-  IDS_ABOUT_DIALOG_HEIGHT_LINES "4"
+  IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+  IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "4"
   IDS_FONTSLANG_DIALOG_WIDTH_CHARS "95"
   IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
   IDS_FONTSLANG_LABEL_WIDTH "17"
diff --git a/chrome/app/resources/locale_settings_zh-CN.rc b/chrome/app/resources/locale_settings_zh-CN.rc
index 906cb3d1..03ae854 100644
--- a/chrome/app/resources/locale_settings_zh-CN.rc
+++ b/chrome/app/resources/locale_settings_zh-CN.rc
@@ -29,8 +29,8 @@ BEGIN
   IDS_CLEARDATA_DIALOG_HEIGHT_LINES "14.5"
   IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
   IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
-  IDS_ABOUT_DIALOG_WIDTH_CHARS "75"
-  IDS_ABOUT_DIALOG_HEIGHT_LINES "5"
+  IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+  IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "5"
   IDS_FONTSLANG_DIALOG_WIDTH_CHARS "95"
   IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
   IDS_FONTSLANG_LABEL_WIDTH "17"
diff --git a/chrome/app/resources/locale_settings_zh-TW.rc b/chrome/app/resources/locale_settings_zh-TW.rc
index ed9cab8..3ed1132 100644
--- a/chrome/app/resources/locale_settings_zh-TW.rc
+++ b/chrome/app/resources/locale_settings_zh-TW.rc
@@ -29,8 +29,8 @@ BEGIN
   IDS_CLEARDATA_DIALOG_HEIGHT_LINES "14.5"
   IDS_IMPORT_DIALOG_WIDTH_CHARS "60"
   IDS_IMPORT_DIALOG_HEIGHT_LINES "14"
-  IDS_ABOUT_DIALOG_WIDTH_CHARS "75"
-  IDS_ABOUT_DIALOG_HEIGHT_LINES "5"
+  IDS_ABOUT_DIALOG_WIDTH_CHARS "70"
+  IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES "5"
   IDS_FONTSLANG_DIALOG_WIDTH_CHARS "95"
   IDS_FONTSLANG_DIALOG_HEIGHT_LINES "26"
   IDS_FONTSLANG_LABEL_WIDTH "17"
diff --git a/chrome/app/theme/chromium/about_background.png b/chrome/app/theme/chromium/about_background.png
index 479f320..b7462e2 100644
--- a/chrome/app/theme/chromium/about_background.png
+++ b/chrome/app/theme/chromium/about_background.png
diff --git a/chrome/app/theme/chromium/about_background_color.png b/chrome/app/theme/chromium/about_background_color.png
new file mode 100644
index 0000000..8d705fc
--- /dev/null
+++ b/chrome/app/theme/chromium/about_background_color.png
diff --git a/chrome/app/theme/chromium/about_background_rtl.png b/chrome/app/theme/chromium/about_background_rtl.png
index 42a31f5..27fc68c 100644
--- a/chrome/app/theme/chromium/about_background_rtl.png
+++ b/chrome/app/theme/chromium/about_background_rtl.png
diff --git a/chrome/app/theme/distribution_resources.rc b/chrome/app/theme/distribution_resources.rc
index 4952d42..b265faa 100644
--- a/chrome/app/theme/distribution_resources.rc
+++ b/chrome/app/theme/distribution_resources.rc
@@ -12,6 +12,7 @@
 #if defined(GOOGLE_CHROME_BUILD)

 IDR_ABOUT_BACKGROUND               BINDATA  "google_chrome/about_background.png"

 IDR_ABOUT_BACKGROUND_RTL           BINDATA  "google_chrome/about_background_rtl.png"

+IDR_ABOUT_BACKGROUND_COLOR         BINDATA  "google_chrome/about_background_color.png"

 IDR_DISTRIBUTOR_LOGO               BINDATA  "google_chrome/distributor_logo.png"

 IDR_DISTRIBUTOR_LOGO_LIGHT         BINDATA  "google_chrome/distributor_logo_light.png"

 IDR_PRODUCT_LOGO                   BINDATA  "google_chrome/product_logo.png"

@@ -20,6 +21,7 @@ IDR_WIZARD_ICON_RTL                BINDATA  "google_chrome/wizard_icon_rtl.png"
 #else

 IDR_ABOUT_BACKGROUND               BINDATA  "chromium/about_background.png"

 IDR_ABOUT_BACKGROUND_RTL           BINDATA  "chromium/about_background_rtl.png"

+IDR_ABOUT_BACKGROUND_COLOR         BINDATA  "chromium/about_background_color.png"

 IDR_PRODUCT_LOGO                   BINDATA  "chromium/product_logo.png"

 IDR_WIZARD_ICON                    BINDATA  "chromium/wizard_icon.png"

 IDR_WIZARD_ICON_RTL                BINDATA  "chromium/wizard_icon_rtl.png"

diff --git a/chrome/app/theme/theme_resources.h b/chrome/app/theme/theme_resources.h
index 0dda934..01e0cc6 100644
--- a/chrome/app/theme/theme_resources.h
+++ b/chrome/app/theme/theme_resources.h
@@ -317,3 +317,4 @@
 #define IDR_BOOKMARK_MANAGER_RECENT_ICON                 9309
 #define IDR_BOOKMARK_MANAGER_SEARCH_ICON                 9310
 #define IDR_MENU_DROPARROW                               9311
+#define IDR_ABOUT_BACKGROUND_COLOR                       9312
diff --git a/chrome/browser/views/about_chrome_view.cc b/chrome/browser/views/about_chrome_view.cc
index 6a479bc..1ab5e5f 100644
--- a/chrome/browser/views/about_chrome_view.cc
+++ b/chrome/browser/views/about_chrome_view.cc
@@ -51,6 +51,10 @@ const wchar_t* kBeginLinkOss = L"BEGIN_LINK_OSS";
 const wchar_t* kEndLinkChr = L"END_LINK_CHR";
 const wchar_t* kEndLinkOss = L"END_LINK_OSS";
 
+// The background bitmap used to draw the background color for the About box
+// and the separator line (this is the image we will draw the logo on top of).
+static const SkBitmap* kBackgroundBmp = NULL;
+
 // Returns a substring from |text| between start and end.
 std::wstring StringSubRange(const std::wstring& text, size_t start,
                             size_t end) {
@@ -65,7 +69,7 @@ std::wstring StringSubRange(const std::wstring& text, size_t start,
 
 AboutChromeView::AboutChromeView(Profile* profile)
     : profile_(profile),
-      about_dlg_background_(NULL),
+      about_dlg_background_logo_(NULL),
       about_title_label_(NULL),
       version_label_(NULL),
       copyright_label_(NULL),
@@ -82,6 +86,11 @@ AboutChromeView::AboutChromeView(Profile* profile)
 
   google_updater_ = new GoogleUpdate();
   google_updater_->AddStatusChangeListener(this);
+
+  if (kBackgroundBmp == NULL) {
+    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+    kBackgroundBmp = rb.GetBitmapNamed(IDR_ABOUT_BACKGROUND_COLOR);
+  }
 }
 
 AboutChromeView::~AboutChromeView() {
@@ -130,15 +139,15 @@ void AboutChromeView::Init() {
   // image for the dialog. We have two different background bitmaps, one for
   // LTR UIs and one for RTL UIs. We load the correct bitmap based on the UI
   // layout of the view.
-  about_dlg_background_ = new views::ImageView();
-  SkBitmap* about_background;
+  about_dlg_background_logo_ = new views::ImageView();
+  SkBitmap* about_background_logo;
   if (UILayoutIsRightToLeft())
-    about_background = rb.GetBitmapNamed(IDR_ABOUT_BACKGROUND_RTL);
+    about_background_logo = rb.GetBitmapNamed(IDR_ABOUT_BACKGROUND_RTL);
   else
-    about_background = rb.GetBitmapNamed(IDR_ABOUT_BACKGROUND);
+    about_background_logo = rb.GetBitmapNamed(IDR_ABOUT_BACKGROUND);
 
-  about_dlg_background_->SetImage(*about_background);
-  AddChildView(about_dlg_background_);
+  about_dlg_background_logo_->SetImage(*about_background_logo);
+  AddChildView(about_dlg_background_logo_);
 
   // Add the dialog labels.
   about_title_label_ = new views::Label(
@@ -198,6 +207,31 @@ void AboutChromeView::Init() {
   AddChildView(open_source_url_);
   open_source_url_->SetController(this);
 
+  // Add together all the strings in the dialog for the purpose of calculating
+  // the height of the dialog. The space for the Terms of Service string is not
+  // included (it is added later, if needed).
+  std::wstring full_text = main_label_chunk1_ + chromium_url_->GetText() +
+                           main_label_chunk2_ + open_source_url_->GetText() +
+                           main_label_chunk3_;
+
+  dialog_dimensions_ = views::Window::GetLocalizedContentsSize(
+      IDS_ABOUT_DIALOG_WIDTH_CHARS,
+      IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES);
+
+  // Create a label and add the full text so we can query it for the height.
+  views::Label dummy_text(full_text);
+  dummy_text.SetMultiLine(true);
+  ChromeFont font =
+      ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont);
+
+  // Add up the height of the various elements on the page.
+  int height = about_background_logo->height() +
+               kRelatedControlVerticalSpacing +
+               font.height() +                // Copyright line.
+               dummy_text.GetHeightForWidth(  // Main label.
+                   dialog_dimensions_.width() - (2 * kPanelHorizMargin)) +
+               kRelatedControlVerticalSpacing;
+
 #if defined(GOOGLE_CHROME_BUILD)
   std::vector<size_t> url_offsets;
   text = l10n_util::GetStringF(IDS_ABOUT_TERMS_OF_SERVICE,
@@ -213,35 +247,32 @@ void AboutChromeView::Init() {
       new views::Link(l10n_util::GetString(IDS_TERMS_OF_SERVICE));
   AddChildView(terms_of_service_url_);
   terms_of_service_url_->SetController(this);
+
+  // Add the Terms of Service line and some whitespace.
+  height += font.height() + kRelatedControlVerticalSpacing;
 #endif
+
+  // Use whichever is greater (the calculated height or the specified minimum
+  // height).
+  dialog_dimensions_.set_height(std::max(height, dialog_dimensions_.height()));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // AboutChromeView, views::View implementation:
 
 gfx::Size AboutChromeView::GetPreferredSize() {
-  gfx::Size prefsize(views::Window::GetLocalizedContentsSize(
-      IDS_ABOUT_DIALOG_WIDTH_CHARS,
-      IDS_ABOUT_DIALOG_HEIGHT_LINES));
-  // We compute the height of the dialog based on the size of the image (it
-  // would be nice to not hard code this), the text in the about dialog and the
-  // margins around the text.
-  prefsize.Enlarge(0, 145 + (kPanelVertMargin * 2));
-  // TODO(beng): Eventually the image should be positioned such that hard-
-  //             coding the width isn't necessary.  This breaks with fonts
-  //             that are large and cause wrapping.
-  prefsize.set_width(422);
-  return prefsize;
+  return dialog_dimensions_;
 }
 
 void AboutChromeView::Layout() {
   gfx::Size panel_size = GetPreferredSize();
 
   // Background image for the dialog.
-  gfx::Size sz = about_dlg_background_->GetPreferredSize();
-  // used to position main text below.
+  gfx::Size sz = about_dlg_background_logo_->GetPreferredSize();
+  // Used to position main text below.
   int background_image_height = sz.height();
-  about_dlg_background_->SetBounds(0, 0, sz.width(), sz.height());
+  about_dlg_background_logo_->SetBounds(panel_size.width() - sz.width(), 0,
+                                        sz.width(), sz.height());
 
   // First label goes to the top left corner.
   sz = about_title_label_->GetPreferredSize();
@@ -318,6 +349,12 @@ void AboutChromeView::Layout() {
 void AboutChromeView::Paint(ChromeCanvas* canvas) {
   views::View::Paint(canvas);
 
+  // Draw the background image color (and the separator) across the dialog.
+  // This will become the background for the logo image at the top of the
+  // dialog.
+  canvas->TileImageInt(*kBackgroundBmp, 0, 0,
+                       dialog_dimensions_.width(), kBackgroundBmp->height());
+
   ChromeFont font =
     ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont);
 
diff --git a/chrome/browser/views/about_chrome_view.h b/chrome/browser/views/about_chrome_view.h
index be876a4..47292e3 100644
--- a/chrome/browser/views/about_chrome_view.h
+++ b/chrome/browser/views/about_chrome_view.h
@@ -122,7 +122,7 @@ class AboutChromeView : public views::View,
   Profile* profile_;
 
   // UI elements on the dialog.
-  views::ImageView* about_dlg_background_;
+  views::ImageView* about_dlg_background_logo_;
   views::Label* about_title_label_;
   views::TextField* version_label_;
   views::Label* copyright_label_;
@@ -141,6 +141,9 @@ class AboutChromeView : public views::View,
   views::ImageView timeout_indicator_;
   views::Label update_label_;
 
+  // The dialog dimensions.
+  gfx::Size dialog_dimensions_;
+
   // Keeps track of the visible state of the Check For Updates button.
   CheckButtonStatus check_button_status_;