diff options
Diffstat (limited to 'chrome')
64 files changed, 465 insertions, 187 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index ffc5ab6..40090e2 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -2941,6 +2941,17 @@ each locale. --> Change search engine </message> + <!-- First run alternative minibubble popup --> + <message name="IDS_FR_OEM_BUBBLE_TITLE_1" desc="Bubble-like popup dialog title, part 1"> + New! + </message> + <message name="IDS_FR_OEM_BUBBLE_TITLE_2" desc="Bubble-like popup dialog title, part 2"> + Search from the address bar. + </message> + <message name="IDS_FR_OEM_BUBBLE_SUBTEXT" desc="Text under the title for the bubble. 'Orchids' may be translated into any locale-appropriate search term."> + Try it out - type "orchids" and press Enter. + </message> + <!-- Sad Tab Strings --> <message name="IDS_SAD_TAB_TITLE" desc="The title of the sad tab page that is shown when a tab crashes. This is intended to be a humorous exclamation of dismay."> Aw, Snap! diff --git a/chrome/app/resources/locale_settings.grd b/chrome/app/resources/locale_settings.grd index 5cff13a..a4ab11e 100644 --- a/chrome/app/resources/locale_settings.grd +++ b/chrome/app/resources/locale_settings.grd @@ -219,7 +219,7 @@ <include name="IDR_TERMS_HTML" file="terms\terms_chromium.html" type="BINDATA" /> </if> </includes> - <messages> + <messages fallback_to_english="true"> <!-- The font used in web-style native pages (e.g. History). --> <message name="IDS_WEB_FONT_FAMILY" use_name_for_id="true"> @@ -507,6 +507,15 @@ 12 </message> + <!-- The width and height of the First Run Search Information mini --> + <!-- bubble in characters and lines (See above). --> + <message name="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS" use_name_for_id="true"> + 70 + </message> + <message name="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES" use_name_for_id="true"> + 4 + </message> + <!-- The URL to be loaded to display Help --> <message name="IDS_HELP_CONTENT_URL" translateable="false"> http://www.google.com/support/chrome/?hl=[GRITLANGCODE] diff --git a/chrome/app/resources/locale_settings_ar.xtb b/chrome/app/resources/locale_settings_ar.xtb index 4f9056e..b651317 100644 --- a/chrome/app/resources/locale_settings_ar.xtb +++ b/chrome/app/resources/locale_settings_ar.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">windows-1256,ISO-8859-6</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_bg.xtb b/chrome/app/resources/locale_settings_bg.xtb index ea7bec85..ec65580 100644 --- a/chrome/app/resources/locale_settings_bg.xtb +++ b/chrome/app/resources/locale_settings_bg.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">windows-1251,KOI8-R,ISO-8859-5</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_bn.xtb b/chrome/app/resources/locale_settings_bn.xtb index 2fa6cbb..6ae3221 100644 --- a/chrome/app/resources/locale_settings_bn.xtb +++ b/chrome/app/resources/locale_settings_bn.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_ca.xtb b/chrome/app/resources/locale_settings_ca.xtb index 7c60e87..0fc5c84 100644 --- a/chrome/app/resources/locale_settings_ca.xtb +++ b/chrome/app/resources/locale_settings_ca.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_cs.xtb b/chrome/app/resources/locale_settings_cs.xtb index bf6705e..3236667 100644 --- a/chrome/app/resources/locale_settings_cs.xtb +++ b/chrome/app/resources/locale_settings_cs.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-2,windows-1250</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_da.xtb b/chrome/app/resources/locale_settings_da.xtb index 03e6d36..6f15053 100644 --- a/chrome/app/resources/locale_settings_da.xtb +++ b/chrome/app/resources/locale_settings_da.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_de.xtb b/chrome/app/resources/locale_settings_de.xtb index c586e96..a51dc85 100644 --- a/chrome/app/resources/locale_settings_de.xtb +++ b/chrome/app/resources/locale_settings_de.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_el.xtb b/chrome/app/resources/locale_settings_el.xtb index 1a2760d..5d2681f 100644 --- a/chrome/app/resources/locale_settings_el.xtb +++ b/chrome/app/resources/locale_settings_el.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">120</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-7,windows-1253</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_en-GB.xtb b/chrome/app/resources/locale_settings_en-GB.xtb index e42a457..b1772bd 100644 --- a/chrome/app/resources/locale_settings_en-GB.xtb +++ b/chrome/app/resources/locale_settings_en-GB.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_es-419.xtb b/chrome/app/resources/locale_settings_es-419.xtb index 2f7d41a..2369b41 100644 --- a/chrome/app/resources/locale_settings_es-419.xtb +++ b/chrome/app/resources/locale_settings_es-419.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">120</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_es.xtb b/chrome/app/resources/locale_settings_es.xtb index c49a033..da7373c 100644 --- a/chrome/app/resources/locale_settings_es.xtb +++ b/chrome/app/resources/locale_settings_es.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">120</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_et.xtb b/chrome/app/resources/locale_settings_et.xtb index 814a2ab..58e03a0 100644 --- a/chrome/app/resources/locale_settings_et.xtb +++ b/chrome/app/resources/locale_settings_et.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">windows-1257,ISO-8859-4,ISO-8859-13</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_fi.xtb b/chrome/app/resources/locale_settings_fi.xtb index 5668917..cf6af56 100644 --- a/chrome/app/resources/locale_settings_fi.xtb +++ b/chrome/app/resources/locale_settings_fi.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252,ISO-8859-15</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_fil.xtb b/chrome/app/resources/locale_settings_fil.xtb index 8044b99..e575f4f 100644 --- a/chrome/app/resources/locale_settings_fil.xtb +++ b/chrome/app/resources/locale_settings_fil.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">14</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_fr.xtb b/chrome/app/resources/locale_settings_fr.xtb index ce11967..98841b8 100644 --- a/chrome/app/resources/locale_settings_fr.xtb +++ b/chrome/app/resources/locale_settings_fr.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">120</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252,ISO-8859-15</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_gu.xtb b/chrome/app/resources/locale_settings_gu.xtb index 9c2552a..bdf93a4 100644 --- a/chrome/app/resources/locale_settings_gu.xtb +++ b/chrome/app/resources/locale_settings_gu.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_he.xtb b/chrome/app/resources/locale_settings_he.xtb index 75efd52..4c29eb6 100644 --- a/chrome/app/resources/locale_settings_he.xtb +++ b/chrome/app/resources/locale_settings_he.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">windows-1255,ISO-8859-8-I,ISO-8859-8,ISO-8859-1</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_hi.xtb b/chrome/app/resources/locale_settings_hi.xtb index 25cdec6..a5298ed 100644 --- a/chrome/app/resources/locale_settings_hi.xtb +++ b/chrome/app/resources/locale_settings_hi.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_hr.xtb b/chrome/app/resources/locale_settings_hr.xtb index fe19c43..1ae358b 100644 --- a/chrome/app/resources/locale_settings_hr.xtb +++ b/chrome/app/resources/locale_settings_hr.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-2,windows-1250</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_hu.xtb b/chrome/app/resources/locale_settings_hu.xtb index fb5f484..b1e392e 100644 --- a/chrome/app/resources/locale_settings_hu.xtb +++ b/chrome/app/resources/locale_settings_hu.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">115</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-2,windows-1250</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_id.xtb b/chrome/app/resources/locale_settings_id.xtb index ee71e0c..d228aba 100644 --- a/chrome/app/resources/locale_settings_id.xtb +++ b/chrome/app/resources/locale_settings_id.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_it.xtb b/chrome/app/resources/locale_settings_it.xtb index 4069643..9c435e0 100644 --- a/chrome/app/resources/locale_settings_it.xtb +++ b/chrome/app/resources/locale_settings_it.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">13</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_ja.xtb b/chrome/app/resources/locale_settings_ja.xtb index 33cf439..463ed8f 100644 --- a/chrome/app/resources/locale_settings_ja.xtb +++ b/chrome/app/resources/locale_settings_ja.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">Shift_JIS,EUC-JP,ISO-2022-JP</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_kn.xtb b/chrome/app/resources/locale_settings_kn.xtb index 916fd249..e529366 100644 --- a/chrome/app/resources/locale_settings_kn.xtb +++ b/chrome/app/resources/locale_settings_kn.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">99</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_ko.xtb b/chrome/app/resources/locale_settings_ko.xtb index 3215f51..0cc53ce 100644 --- a/chrome/app/resources/locale_settings_ko.xtb +++ b/chrome/app/resources/locale_settings_ko.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">windows-949</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_lt.xtb b/chrome/app/resources/locale_settings_lt.xtb index 910ca0f..12fec10 100644 --- a/chrome/app/resources/locale_settings_lt.xtb +++ b/chrome/app/resources/locale_settings_lt.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">windows-1257,ISO-8859-4,ISO-8859-13</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_lv.xtb b/chrome/app/resources/locale_settings_lv.xtb index ffcc54a..76a2438 100644 --- a/chrome/app/resources/locale_settings_lv.xtb +++ b/chrome/app/resources/locale_settings_lv.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">110</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">windows-1257,ISO-8859-4,ISO-8859-13</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_ml.xtb b/chrome/app/resources/locale_settings_ml.xtb index 801dc54..40dcf21 100644 --- a/chrome/app/resources/locale_settings_ml.xtb +++ b/chrome/app/resources/locale_settings_ml.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">108</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_mr.xtb b/chrome/app/resources/locale_settings_mr.xtb index a2f551d..bf19eac 100644 --- a/chrome/app/resources/locale_settings_mr.xtb +++ b/chrome/app/resources/locale_settings_mr.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_nb.xtb b/chrome/app/resources/locale_settings_nb.xtb index 4450050..0f9ee3d 100644 --- a/chrome/app/resources/locale_settings_nb.xtb +++ b/chrome/app/resources/locale_settings_nb.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_nl.xtb b/chrome/app/resources/locale_settings_nl.xtb index 337d381..9dabd67 100644 --- a/chrome/app/resources/locale_settings_nl.xtb +++ b/chrome/app/resources/locale_settings_nl.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_or.xtb b/chrome/app/resources/locale_settings_or.xtb index a3f800f..162f729 100644 --- a/chrome/app/resources/locale_settings_or.xtb +++ b/chrome/app/resources/locale_settings_or.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_pl.xtb b/chrome/app/resources/locale_settings_pl.xtb index 724eb4a..e972968 100644 --- a/chrome/app/resources/locale_settings_pl.xtb +++ b/chrome/app/resources/locale_settings_pl.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-2,windows-1250</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_pt-BR.xtb b/chrome/app/resources/locale_settings_pt-BR.xtb index 5f94850..39d440f3 100644 --- a/chrome/app/resources/locale_settings_pt-BR.xtb +++ b/chrome/app/resources/locale_settings_pt-BR.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">120</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_pt-PT.xtb b/chrome/app/resources/locale_settings_pt-PT.xtb index 50b7fc6..f6d7e90 100644 --- a/chrome/app/resources/locale_settings_pt-PT.xtb +++ b/chrome/app/resources/locale_settings_pt-PT.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_ro.xtb b/chrome/app/resources/locale_settings_ro.xtb index ff04829..24e74e6 100644 --- a/chrome/app/resources/locale_settings_ro.xtb +++ b/chrome/app/resources/locale_settings_ro.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-2,windows-1250</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_ru.xtb b/chrome/app/resources/locale_settings_ru.xtb index f52cdf7..b045e37 100644 --- a/chrome/app/resources/locale_settings_ru.xtb +++ b/chrome/app/resources/locale_settings_ru.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">120</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">windows-1251,,KOI8-R,KOI8-U,ISO-8859-5</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_sk.xtb b/chrome/app/resources/locale_settings_sk.xtb index be21c7a..07f6ad2 100644 --- a/chrome/app/resources/locale_settings_sk.xtb +++ b/chrome/app/resources/locale_settings_sk.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">120</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">windows-1250,ISO-8859-2</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_sl.xtb b/chrome/app/resources/locale_settings_sl.xtb index 9b822bf..aa43761 100644 --- a/chrome/app/resources/locale_settings_sl.xtb +++ b/chrome/app/resources/locale_settings_sl.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-2,windows-1250</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_sr.xtb b/chrome/app/resources/locale_settings_sr.xtb index b76ad39..69bf85c 100644 --- a/chrome/app/resources/locale_settings_sr.xtb +++ b/chrome/app/resources/locale_settings_sr.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">110</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">windows-1251,KOI8-R,ISO-8859-5</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_sv.xtb b/chrome/app/resources/locale_settings_sv.xtb index a6ef6f9..bada285 100644 --- a/chrome/app/resources/locale_settings_sv.xtb +++ b/chrome/app/resources/locale_settings_sv.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_ta.xtb b/chrome/app/resources/locale_settings_ta.xtb index 982d830..5e343ce 100644 --- a/chrome/app/resources/locale_settings_ta.xtb +++ b/chrome/app/resources/locale_settings_ta.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">110</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_te.xtb b/chrome/app/resources/locale_settings_te.xtb index 39a19dc..6b362fc 100644 --- a/chrome/app/resources/locale_settings_te.xtb +++ b/chrome/app/resources/locale_settings_te.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">99</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-1,windows-1252</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_th.xtb b/chrome/app/resources/locale_settings_th.xtb index 5e44c6b..8d10d23 100644 --- a/chrome/app/resources/locale_settings_th.xtb +++ b/chrome/app/resources/locale_settings_th.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">windows-874</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_tr.xtb b/chrome/app/resources/locale_settings_tr.xtb index a83ea15..f82b1d4 100644 --- a/chrome/app/resources/locale_settings_tr.xtb +++ b/chrome/app/resources/locale_settings_tr.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-9,windows-1254</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_uk.xtb b/chrome/app/resources/locale_settings_uk.xtb index bbf3d3e..7ed6faa 100644 --- a/chrome/app/resources/locale_settings_uk.xtb +++ b/chrome/app/resources/locale_settings_uk.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">120</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">windows-1251,KOI8-U,KOI8-R,ISO-8859-5</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_vi.xtb b/chrome/app/resources/locale_settings_vi.xtb index 3e85baf9..ad2c34e 100644 --- a/chrome/app/resources/locale_settings_vi.xtb +++ b/chrome/app/resources/locale_settings_vi.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">windows-1258</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_zh-CN.xtb b/chrome/app/resources/locale_settings_zh-CN.xtb index 52772fe..8fc3416 100644 --- a/chrome/app/resources/locale_settings_zh-CN.xtb +++ b/chrome/app/resources/locale_settings_zh-CN.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">GBK,gb18030</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/app/resources/locale_settings_zh-TW.xtb b/chrome/app/resources/locale_settings_zh-TW.xtb index d04ed71..56db9bd 100644 --- a/chrome/app/resources/locale_settings_zh-TW.xtb +++ b/chrome/app/resources/locale_settings_zh-TW.xtb @@ -56,6 +56,8 @@ <translation id="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">8</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">93</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> +<translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> <translation id="IDS_STATIC_ENCODING_LIST">Big5,Big5-HKSCS</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> diff --git a/chrome/browser/first_run.cc b/chrome/browser/first_run.cc index 7dbb3df..3a24488 100644 --- a/chrome/browser/first_run.cc +++ b/chrome/browser/first_run.cc @@ -266,6 +266,9 @@ bool FirstRun::ProcessMasterPreferences(const FilePath& user_data_dir, } } + if (parse_result & installer_util::MASTER_PROFILE_OEM_FIRST_RUN_BUBBLE) + FirstRun::SetOEMFirstRunBubblePref(); + FilePath user_prefs = FilePath::FromWStringHack( GetDefaultPrefFilePath(true, user_data_dir.ToWStringHack())); if (user_prefs.empty()) @@ -640,6 +643,18 @@ bool FirstRun::SetShowFirstRunBubblePref() { return true; } +bool FirstRun::SetOEMFirstRunBubblePref() { + PrefService* local_state = g_browser_process->local_state(); + if (!local_state) + return false; + if (!local_state->IsPrefRegistered(prefs::kShouldUseOEMFirstRunBubble)) { + local_state->RegisterBooleanPref(prefs::kShouldUseOEMFirstRunBubble, + false); + local_state->SetBoolean(prefs::kShouldUseOEMFirstRunBubble, true); + } + return true; +} + bool FirstRun::SetShowWelcomePagePref() { PrefService* local_state = g_browser_process->local_state(); if (!local_state) diff --git a/chrome/browser/first_run.h b/chrome/browser/first_run.h index d11e0b4..737cd00 100644 --- a/chrome/browser/first_run.h +++ b/chrome/browser/first_run.h @@ -76,6 +76,11 @@ class FirstRun { // the pref could not be set. static bool SetShowFirstRunBubblePref(); + // Sets the kShouldUseOEMFirstRunBubble local state pref so that the + // browser shows the OEM first run bubble once the main message loop + // gets going. Returns false if the pref could not be set. + static bool SetOEMFirstRunBubblePref(); + // Sets the kShouldShowWelcomePage local state pref so that the browser // loads the welcome tab once the message loop gets going. Returns false // if the pref could not be set. diff --git a/chrome/browser/location_bar.h b/chrome/browser/location_bar.h index 70a06d5..218f65c 100644 --- a/chrome/browser/location_bar.h +++ b/chrome/browser/location_bar.h @@ -22,7 +22,7 @@ class TabContents; class LocationBar { public: // Shows the first run information bubble anchored to the location bar. - virtual void ShowFirstRunBubble() = 0; + virtual void ShowFirstRunBubble(bool use_OEM_bubble) = 0; // Returns the string of text entered in the location bar. virtual std::wstring GetInputString() const = 0; diff --git a/chrome/browser/views/first_run_bubble.cc b/chrome/browser/views/first_run_bubble.cc index 0ca491c..df5000e 100644 --- a/chrome/browser/views/first_run_bubble.cc +++ b/chrome/browser/views/first_run_bubble.cc @@ -16,8 +16,10 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" +#include "grit/theme_resources.h" #include "views/event.h" #include "views/controls/button/native_button.h" +#include "views/controls/button/image_button.h" #include "views/controls/label.h" #include "views/focus/focus_manager.h" #include "views/standard_layout.h" @@ -29,6 +31,17 @@ namespace { // provides. static const int kBubblePadding = 4; +// How much extra padding to put around our content over what the InfoBubble +// provides in alternative OEM bubble. +static const int kOEMBubblePadding = 4; + +// Padding between parts of strings on the same line (for instance, +// "New!" and "Search from the address bar!" +static const int kStringSeparationPadding = 2; + +// Margin around close button. +static const int kMarginRightOfCloseButton = 7; + std::wstring GetDefaultSearchEngineName(Profile* profile) { if (!profile) { NOTREACHED(); @@ -47,11 +60,18 @@ std::wstring GetDefaultSearchEngineName(Profile* profile) { } // namespace -// Implements the client view inside the first run bubble. It is kind of a -// dialog-ish view, but is not a true dialog. -class FirstRunBubbleView : public views::View, - public views::ButtonListener, - public views::FocusChangeListener { +// Base class for implementations of the client view which appears inside the +// first run bubble. It is a dialog-ish view, but is not a true dialog. +class FirstRunBubbleViewBase : public views::View, + public views::ButtonListener, + public views::FocusChangeListener { + public: + // Called by FirstRunBubble::Show to request focus for the proper button + // in the FirstRunBubbleView when it is shown. + virtual void BubbleShown() = 0; +}; + +class FirstRunBubbleView : public FirstRunBubbleViewBase { public: FirstRunBubbleView(FirstRunBubble* bubble_window, Profile* profile) : bubble_window_(bubble_window), @@ -103,7 +123,6 @@ class FirstRunBubbleView : public views::View, keep_button_->RequestFocus(); } - // Overridden from ButtonListener. virtual void ButtonPressed(views::Button* sender) { bubble_window_->Close(); if (change_button_ == sender) { @@ -115,7 +134,6 @@ class FirstRunBubbleView : public views::View, } } - // Overridden from views::View. virtual void Layout() { gfx::Size canvas = GetPreferredSize(); @@ -157,7 +175,6 @@ class FirstRunBubbleView : public views::View, pref_size.width(), pref_size.height()); } - // Overridden from views::View. virtual gfx::Size GetPreferredSize() { return gfx::Size(views::Window::GetLocalizedContentsSize( IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS, @@ -190,6 +207,111 @@ class FirstRunBubbleView : public views::View, DISALLOW_COPY_AND_ASSIGN(FirstRunBubbleView); }; +class FirstRunOEMBubbleView : public FirstRunBubbleViewBase { + public: + FirstRunOEMBubbleView(FirstRunBubble* bubble_window, Profile* profile) + : bubble_window_(bubble_window), + label1_(NULL), + label2_(NULL), + label3_(NULL), + close_button_(NULL) { + ResourceBundle& rb = ResourceBundle::GetSharedInstance(); + gfx::Font& font = rb.GetFont(ResourceBundle::MediumFont); + + label1_ = new views::Label( + l10n_util::GetString(IDS_FR_OEM_BUBBLE_TITLE_1)); + label1_->SetFont(font.DeriveFont(3, gfx::Font::BOLD)); + label1_->SetColor(SK_ColorRED); + label1_->SetHorizontalAlignment(views::Label::ALIGN_LEFT); + AddChildView(label1_); + + label2_ = new views::Label( + l10n_util::GetString(IDS_FR_OEM_BUBBLE_TITLE_2)); + label2_->SetFont(font.DeriveFont(3, gfx::Font::BOLD)); + label2_->SetHorizontalAlignment(views::Label::ALIGN_LEFT); + AddChildView(label2_); + + gfx::Size ps = GetPreferredSize(); + + label3_ = new views::Label( + l10n_util::GetString(IDS_FR_OEM_BUBBLE_SUBTEXT)); + label3_->SetMultiLine(true); + label3_->SetFont(font); + label3_->SetHorizontalAlignment(views::Label::ALIGN_LEFT); + label3_->SizeToFit(ps.width() - kOEMBubblePadding * 2); + AddChildView(label3_); + + close_button_ = new views::ImageButton(this); + close_button_->SetImage(views::CustomButton::BS_NORMAL, + rb.GetBitmapNamed(IDR_CLOSE_BAR)); + close_button_->SetImage(views::CustomButton::BS_HOT, + rb.GetBitmapNamed(IDR_CLOSE_BAR_H)); + close_button_->SetImage(views::CustomButton::BS_PUSHED, + rb.GetBitmapNamed(IDR_CLOSE_BAR_P)); + + AddChildView(close_button_); + } + + void BubbleShown() { + // No button in oem_bubble to request focus. + } + + virtual void ButtonPressed(views::Button* sender) { + bubble_window_->Close(); + } + + virtual void Layout() { + gfx::Size canvas = GetPreferredSize(); + + // First, draw the close button on the far right. + gfx::Size sz = close_button_->GetPreferredSize(); + close_button_->SetBounds(canvas.width() - sz.width() - + kMarginRightOfCloseButton, + kOEMBubblePadding, + sz.width(), + sz.height()); + + gfx::Size pref_size = label1_->GetPreferredSize(); + label1_->SetBounds(kOEMBubblePadding, kOEMBubblePadding, + pref_size.width() + kOEMBubblePadding * 2, + pref_size.height()); + + pref_size = label2_->GetPreferredSize(); + label2_->SetBounds(kOEMBubblePadding * 2 + label1_-> + GetPreferredSize().width(), + kOEMBubblePadding, + canvas.width() - kOEMBubblePadding * 2, + pref_size.height()); + + int next_v_space = label1_->y() + pref_size.height() + + kRelatedControlSmallVerticalSpacing; + + pref_size = label3_->GetPreferredSize(); + label3_->SetBounds(kOEMBubblePadding, next_v_space, + canvas.width() - kOEMBubblePadding * 2, + pref_size.height()); + } + + virtual gfx::Size GetPreferredSize() { + return gfx::Size(views::Window::GetLocalizedContentsSize( + IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS, + IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES)); + } + + virtual void FocusWillChange(View* focused_before, View* focused_now) { + // No buttons in oem_bubble to register focus changes. + } + + private: + FirstRunBubble* bubble_window_; + views::Label* label1_; + views::Label* label2_; + views::Label* label3_; + views::ImageButton* close_button_; + + DISALLOW_COPY_AND_ASSIGN(FirstRunOEMBubbleView); +}; + // Keep the bubble around for kLingerTime milliseconds, to prevent accidental // closure. static const int kLingerTime = 1000; @@ -201,8 +323,6 @@ void FirstRunBubble::OnActivate(UINT action, BOOL minimized, HWND window) { if (action == WA_ACTIVE && !has_been_activated_) { has_been_activated_ = true; - // Disable the browser to prevent accidental rapid clicks from closing the - // bubble. ::EnableWindow(GetParent(), false); MessageLoop::current()->PostDelayedTask(FROM_HERE, @@ -210,6 +330,7 @@ void FirstRunBubble::OnActivate(UINT action, BOOL minimized, HWND window) { &FirstRunBubble::EnableParent), kLingerTime); } + InfoBubble::OnActivate(action, minimized, window); } @@ -226,9 +347,14 @@ void FirstRunBubble::InfoBubbleClosing(InfoBubble* info_bubble, // static FirstRunBubble* FirstRunBubble::Show(Profile* profile, HWND parent_hwnd, - const gfx::Rect& position_relative_to) { + const gfx::Rect& position_relative_to, + bool use_OEM_bubble) { FirstRunBubble* window = new FirstRunBubble(); - FirstRunBubbleView* view = new FirstRunBubbleView(window, profile); + FirstRunBubbleViewBase* view = NULL; + if (use_OEM_bubble) + view = new FirstRunOEMBubbleView(window, profile); + else + view = new FirstRunBubbleView(window, profile); window->SetDelegate(window); window->set_view(view); window->Init(parent_hwnd, position_relative_to, view); diff --git a/chrome/browser/views/first_run_bubble.h b/chrome/browser/views/first_run_bubble.h index d921987..598362b 100644 --- a/chrome/browser/views/first_run_bubble.h +++ b/chrome/browser/views/first_run_bubble.h @@ -8,14 +8,15 @@ #include "base/task.h" #include "chrome/browser/views/info_bubble.h" -class FirstRunBubbleView; +class FirstRunBubbleViewBase; class Profile; class FirstRunBubble : public InfoBubble, public InfoBubbleDelegate { public: static FirstRunBubble* Show(Profile* profile, HWND parent_hwnd, - const gfx::Rect& position_relative_to); + const gfx::Rect& position_relative_to, + bool use_OEM_bubble); FirstRunBubble() : enable_window_method_factory_(this), @@ -29,7 +30,7 @@ class FirstRunBubble : public InfoBubble, enable_window_method_factory_.RevokeAll(); } - void set_view(FirstRunBubbleView* view) { view_ = view; } + void set_view(FirstRunBubbleViewBase* view) { view_ = view; } // Overridden from InfoBubble: virtual void OnActivate(UINT action, BOOL minimized, HWND window); @@ -49,7 +50,7 @@ class FirstRunBubble : public InfoBubble, ScopedRunnableMethodFactory<FirstRunBubble> enable_window_method_factory_; // The view inside the FirstRunBubble. - FirstRunBubbleView* view_; + FirstRunBubbleViewBase* view_; DISALLOW_COPY_AND_ASSIGN(FirstRunBubble); }; diff --git a/chrome/browser/views/location_bar_view.cc b/chrome/browser/views/location_bar_view.cc index 415334e..83c23c9 100644 --- a/chrome/browser/views/location_bar_view.cc +++ b/chrome/browser/views/location_bar_view.cc @@ -936,7 +936,7 @@ void LocationBarView::ShowInfoBubbleTask::Cancel() { // ----------------------------------------------------------------------------- -void LocationBarView::ShowFirstRunBubbleInternal() { +void LocationBarView::ShowFirstRunBubbleInternal(bool use_OEM_bubble) { if (!location_entry_view_) return; if (!location_entry_view_->GetWidget()->IsActive()) { @@ -965,7 +965,7 @@ void LocationBarView::ShowFirstRunBubbleInternal() { FirstRunBubble::Show(profile_, location_entry_view_->GetRootView()->GetWidget()->GetNativeView(), - bounds); + bounds, use_OEM_bubble); } // LocationBarImageView--------------------------------------------------------- @@ -1169,10 +1169,10 @@ bool LocationBarView::OverrideAccelerator( //////////////////////////////////////////////////////////////////////////////// // LocationBarView, LocationBar implementation: -void LocationBarView::ShowFirstRunBubble() { +void LocationBarView::ShowFirstRunBubble(bool use_OEM_bubble) { // We wait 30 milliseconds to open. It allows less flicker. Task* task = first_run_bubble_.NewRunnableMethod( - &LocationBarView::ShowFirstRunBubbleInternal); + &LocationBarView::ShowFirstRunBubbleInternal, use_OEM_bubble); MessageLoop::current()->PostDelayedTask(FROM_HERE, task, 30); } diff --git a/chrome/browser/views/location_bar_view.h b/chrome/browser/views/location_bar_view.h index b0648d7..e81c5fc 100644 --- a/chrome/browser/views/location_bar_view.h +++ b/chrome/browser/views/location_bar_view.h @@ -111,7 +111,7 @@ class LocationBarView : public LocationBar, virtual bool OverrideAccelerator(const views::Accelerator& accelerator); // Overridden from LocationBar: - virtual void ShowFirstRunBubble(); + virtual void ShowFirstRunBubble(bool use_OEM_bubble); virtual std::wstring GetInputString() const; virtual WindowOpenDisposition GetWindowOpenDisposition() const; virtual PageTransition::Type GetPageTransition() const; @@ -416,7 +416,7 @@ class LocationBarView : public LocationBar, void OnMouseEvent(const views::MouseEvent& event, UINT msg); // Helper to show the first run info bubble. - void ShowFirstRunBubbleInternal(); + void ShowFirstRunBubbleInternal(bool use_OEM_bubble); // Current profile. Not owned by us. Profile* profile_; diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc index f414d27..9dd08c8 100644 --- a/chrome/common/pref_names.cc +++ b/chrome/common/pref_names.cc @@ -462,6 +462,12 @@ const wchar_t kOptionsWindowLastTabIndex[] = L"options_window.last_tab_index"; // This preference is only registered by the first-run procedure. const wchar_t kShouldShowFirstRunBubble[] = L"show-first-run-bubble"; +// The mere fact that this pref is registered signals that we should show the +// smaller OEM First Run Search Information bubble when the first +// browser window appears. +// This preference is only registered by the first-run procedure. +const wchar_t kShouldUseOEMFirstRunBubble[] = L"show-OEM-first-run-bubble"; + // Signal that we should show the welcome page when we launch Chrome. const wchar_t kShouldShowWelcomePage[] = L"show-welcome-page"; diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h index 83fdfd1..5979204 100644 --- a/chrome/common/pref_names.h +++ b/chrome/common/pref_names.h @@ -166,6 +166,7 @@ extern const wchar_t kSafeBrowsingWrappedKey[]; extern const wchar_t kOptionsWindowLastTabIndex[]; extern const wchar_t kShouldShowFirstRunBubble[]; +extern const wchar_t kShouldUseOEMFirstRunBubble[]; extern const wchar_t kShouldShowWelcomePage[]; extern const wchar_t kLastKnownGoogleURL[]; diff --git a/chrome/installer/gcapi/gcapi_test.vcproj b/chrome/installer/gcapi/gcapi_test.vcproj index 02f4df4..d51b464 100644 --- a/chrome/installer/gcapi/gcapi_test.vcproj +++ b/chrome/installer/gcapi/gcapi_test.vcproj @@ -1,160 +1,160 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="gcapi_test"
- ProjectGUID="{B64B396B-8EF1-4B6B-A07E-48D40EB961AB}"
- RootNamespace="gcapi_test"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- ConfigurationType="1"
- InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\debug.vsprops"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- ConfigurationType="1"
- InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\release.vsprops"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\gcapi.h"
- >
- </File>
- <File
- RelativePath=".\gcapi_test.cc"
- >
- </File>
- <File
- RelativePath=".\gcapi_test.rc"
- >
- </File>
- <File
- RelativePath=".\resource.h"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8.00" + Name="gcapi_test" + ProjectGUID="{B64B396B-8EF1-4B6B-A07E-48D40EB961AB}" + RootNamespace="gcapi_test" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="1" + InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\debug.vsprops" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="1" + InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\release.vsprops" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\gcapi.h" + > + </File> + <File + RelativePath=".\gcapi_test.cc" + > + </File> + <File + RelativePath=".\gcapi_test.rc" + > + </File> + <File + RelativePath=".\resource.h" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> diff --git a/chrome/installer/util/master_preferences.cc b/chrome/installer/util/master_preferences.cc index d376456..9e440af 100644 --- a/chrome/installer/util/master_preferences.cc +++ b/chrome/installer/util/master_preferences.cc @@ -69,6 +69,8 @@ const wchar_t kVerboseLogging[] = L"verbose_logging"; const wchar_t kRequireEula[] = L"require_eula"; // Use alternate shortcut text for the main shortcut. const wchar_t kAltShortcutText[] = L"alternate_shortcut_text"; +// Use alternate smaller first run info bubble. +const wchar_t kAltFirstRunBubble[] = L"oem_bubble"; int ParseDistributionPreferences(const std::wstring& master_prefs_path) { @@ -109,6 +111,8 @@ int ParseDistributionPreferences(const std::wstring& master_prefs_path) { parse_result |= MASTER_PROFILE_REQUIRE_EULA; if (GetBooleanPref(distro, kAltShortcutText)) parse_result |= MASTER_PROFILE_ALT_SHORTCUT_TXT; + if (GetBooleanPref(distro, kAltFirstRunBubble)) + parse_result |= MASTER_PROFILE_OEM_FIRST_RUN_BUBBLE; } return parse_result; } diff --git a/chrome/installer/util/master_preferences.h b/chrome/installer/util/master_preferences.h index 14426f1..46513e9 100644 --- a/chrome/installer/util/master_preferences.h +++ b/chrome/installer/util/master_preferences.h @@ -53,7 +53,9 @@ enum MasterPrefResult { // Show the EULA and do not install if not accepted. MASTER_PROFILE_REQUIRE_EULA = 0x1 << 13, // Use an alternate description text for some shortcuts. - MASTER_PROFILE_ALT_SHORTCUT_TXT = 0x1 << 14 + MASTER_PROFILE_ALT_SHORTCUT_TXT = 0x1 << 14, + // Use a smaller OEM info bubble on first run. + MASTER_PROFILE_OEM_FIRST_RUN_BUBBLE = 0x1 << 15 }; // The master preferences is a JSON file with the same entries as the @@ -101,7 +103,7 @@ int ParseDistributionPreferences(const std::wstring& master_prefs_path); // As part of the master preferences an optional section indicates the tabs // to open during first run. An example is the following: // -// { +// { // "first_run_tabs": [ // "http://google.com/f1", // "https://google.com/f2" diff --git a/chrome/test/test_location_bar.h b/chrome/test/test_location_bar.h index d347837..95ce2c1 100644 --- a/chrome/test/test_location_bar.h +++ b/chrome/test/test_location_bar.h @@ -27,7 +27,7 @@ class TestLocationBar : public LocationBar { } // Overridden from LocationBar: - virtual void ShowFirstRunBubble() {} + virtual void ShowFirstRunBubble(bool use_OEM_bubble) {} virtual std::wstring GetInputString() const { return input_string_; } virtual WindowOpenDisposition GetWindowOpenDisposition() const { return disposition_; |