summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorglen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-16 22:00:02 +0000
committerglen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-16 22:00:02 +0000
commitb09219ce1c3cc989179eceb15da8ac44a48cf210 (patch)
tree090679a0bc50a59307a1c9a7fc2b1ff98dd06a83
parent2ca113a46d9d8fe80324f1cce0c28c5142b7441a (diff)
downloadchromium_src-b09219ce1c3cc989179eceb15da8ac44a48cf210.zip
chromium_src-b09219ce1c3cc989179eceb15da8ac44a48cf210.tar.gz
chromium_src-b09219ce1c3cc989179eceb15da8ac44a48cf210.tar.bz2
Revert the first run bubble change because of Mac/Linux failures.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16245 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/app/generated_resources.grd11
-rw-r--r--chrome/app/resources/locale_settings.grd11
-rw-r--r--chrome/app/resources/locale_settings_ar.xtb2
-rw-r--r--chrome/app/resources/locale_settings_bg.xtb2
-rw-r--r--chrome/app/resources/locale_settings_bn.xtb2
-rw-r--r--chrome/app/resources/locale_settings_ca.xtb2
-rw-r--r--chrome/app/resources/locale_settings_cs.xtb2
-rw-r--r--chrome/app/resources/locale_settings_da.xtb2
-rw-r--r--chrome/app/resources/locale_settings_de.xtb2
-rw-r--r--chrome/app/resources/locale_settings_el.xtb2
-rw-r--r--chrome/app/resources/locale_settings_en-GB.xtb2
-rw-r--r--chrome/app/resources/locale_settings_es-419.xtb2
-rw-r--r--chrome/app/resources/locale_settings_es.xtb2
-rw-r--r--chrome/app/resources/locale_settings_et.xtb2
-rw-r--r--chrome/app/resources/locale_settings_fi.xtb2
-rw-r--r--chrome/app/resources/locale_settings_fil.xtb2
-rw-r--r--chrome/app/resources/locale_settings_fr.xtb2
-rw-r--r--chrome/app/resources/locale_settings_gu.xtb2
-rw-r--r--chrome/app/resources/locale_settings_he.xtb2
-rw-r--r--chrome/app/resources/locale_settings_hi.xtb2
-rw-r--r--chrome/app/resources/locale_settings_hr.xtb2
-rw-r--r--chrome/app/resources/locale_settings_hu.xtb2
-rw-r--r--chrome/app/resources/locale_settings_id.xtb2
-rw-r--r--chrome/app/resources/locale_settings_it.xtb2
-rw-r--r--chrome/app/resources/locale_settings_ja.xtb2
-rw-r--r--chrome/app/resources/locale_settings_kn.xtb2
-rw-r--r--chrome/app/resources/locale_settings_ko.xtb2
-rw-r--r--chrome/app/resources/locale_settings_lt.xtb2
-rw-r--r--chrome/app/resources/locale_settings_lv.xtb2
-rw-r--r--chrome/app/resources/locale_settings_ml.xtb2
-rw-r--r--chrome/app/resources/locale_settings_mr.xtb2
-rw-r--r--chrome/app/resources/locale_settings_nb.xtb2
-rw-r--r--chrome/app/resources/locale_settings_nl.xtb2
-rw-r--r--chrome/app/resources/locale_settings_or.xtb2
-rw-r--r--chrome/app/resources/locale_settings_pl.xtb2
-rw-r--r--chrome/app/resources/locale_settings_pt-BR.xtb2
-rw-r--r--chrome/app/resources/locale_settings_pt-PT.xtb2
-rw-r--r--chrome/app/resources/locale_settings_ro.xtb2
-rw-r--r--chrome/app/resources/locale_settings_ru.xtb2
-rw-r--r--chrome/app/resources/locale_settings_sk.xtb2
-rw-r--r--chrome/app/resources/locale_settings_sl.xtb2
-rw-r--r--chrome/app/resources/locale_settings_sr.xtb2
-rw-r--r--chrome/app/resources/locale_settings_sv.xtb2
-rw-r--r--chrome/app/resources/locale_settings_ta.xtb2
-rw-r--r--chrome/app/resources/locale_settings_te.xtb2
-rw-r--r--chrome/app/resources/locale_settings_th.xtb2
-rw-r--r--chrome/app/resources/locale_settings_tr.xtb2
-rw-r--r--chrome/app/resources/locale_settings_uk.xtb2
-rw-r--r--chrome/app/resources/locale_settings_vi.xtb2
-rw-r--r--chrome/app/resources/locale_settings_zh-CN.xtb2
-rw-r--r--chrome/app/resources/locale_settings_zh-TW.xtb2
-rw-r--r--chrome/browser/browser.cc5
-rw-r--r--chrome/browser/first_run.cc15
-rw-r--r--chrome/browser/first_run.h5
-rw-r--r--chrome/browser/location_bar.h2
-rw-r--r--chrome/browser/views/first_run_bubble.cc150
-rw-r--r--chrome/browser/views/first_run_bubble.h9
-rw-r--r--chrome/browser/views/location_bar_view.cc8
-rw-r--r--chrome/browser/views/location_bar_view.h4
-rw-r--r--chrome/common/pref_names.cc6
-rw-r--r--chrome/common/pref_names.h1
-rw-r--r--chrome/installer/util/master_preferences.cc4
-rw-r--r--chrome/installer/util/master_preferences.h6
-rw-r--r--chrome/test/test_location_bar.h2
64 files changed, 28 insertions, 309 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 40090e2..ffc5ab6 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -2941,17 +2941,6 @@ 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 a4ab11e..5cff13a 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 fallback_to_english="true">
+ <messages>
<!-- The font used in web-style native pages (e.g. History). -->
<message name="IDS_WEB_FONT_FAMILY" use_name_for_id="true">
@@ -507,15 +507,6 @@
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 b651317..4f9056e 100644
--- a/chrome/app/resources/locale_settings_ar.xtb
+++ b/chrome/app/resources/locale_settings_ar.xtb
@@ -56,8 +56,6 @@
<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 ec65580..ea7bec85 100644
--- a/chrome/app/resources/locale_settings_bg.xtb
+++ b/chrome/app/resources/locale_settings_bg.xtb
@@ -56,8 +56,6 @@
<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 6ae3221..2fa6cbb 100644
--- a/chrome/app/resources/locale_settings_bn.xtb
+++ b/chrome/app/resources/locale_settings_bn.xtb
@@ -56,8 +56,6 @@
<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 0fc5c84..7c60e87 100644
--- a/chrome/app/resources/locale_settings_ca.xtb
+++ b/chrome/app/resources/locale_settings_ca.xtb
@@ -56,8 +56,6 @@
<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 3236667..bf6705e 100644
--- a/chrome/app/resources/locale_settings_cs.xtb
+++ b/chrome/app/resources/locale_settings_cs.xtb
@@ -56,8 +56,6 @@
<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 6f15053..03e6d36 100644
--- a/chrome/app/resources/locale_settings_da.xtb
+++ b/chrome/app/resources/locale_settings_da.xtb
@@ -56,8 +56,6 @@
<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 a51dc85..c586e96 100644
--- a/chrome/app/resources/locale_settings_de.xtb
+++ b/chrome/app/resources/locale_settings_de.xtb
@@ -56,8 +56,6 @@
<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 5d2681f..1a2760d 100644
--- a/chrome/app/resources/locale_settings_el.xtb
+++ b/chrome/app/resources/locale_settings_el.xtb
@@ -56,8 +56,6 @@
<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 b1772bd..e42a457 100644
--- a/chrome/app/resources/locale_settings_en-GB.xtb
+++ b/chrome/app/resources/locale_settings_en-GB.xtb
@@ -56,8 +56,6 @@
<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 2369b41..2f7d41a 100644
--- a/chrome/app/resources/locale_settings_es-419.xtb
+++ b/chrome/app/resources/locale_settings_es-419.xtb
@@ -56,8 +56,6 @@
<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 da7373c..c49a033 100644
--- a/chrome/app/resources/locale_settings_es.xtb
+++ b/chrome/app/resources/locale_settings_es.xtb
@@ -56,8 +56,6 @@
<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 58e03a0..814a2ab 100644
--- a/chrome/app/resources/locale_settings_et.xtb
+++ b/chrome/app/resources/locale_settings_et.xtb
@@ -56,8 +56,6 @@
<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 cf6af56..5668917 100644
--- a/chrome/app/resources/locale_settings_fi.xtb
+++ b/chrome/app/resources/locale_settings_fi.xtb
@@ -56,8 +56,6 @@
<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 e575f4f..8044b99 100644
--- a/chrome/app/resources/locale_settings_fil.xtb
+++ b/chrome/app/resources/locale_settings_fil.xtb
@@ -56,8 +56,6 @@
<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 98841b8..ce11967 100644
--- a/chrome/app/resources/locale_settings_fr.xtb
+++ b/chrome/app/resources/locale_settings_fr.xtb
@@ -56,8 +56,6 @@
<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 bdf93a4..9c2552a 100644
--- a/chrome/app/resources/locale_settings_gu.xtb
+++ b/chrome/app/resources/locale_settings_gu.xtb
@@ -56,8 +56,6 @@
<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 4c29eb6..75efd52 100644
--- a/chrome/app/resources/locale_settings_he.xtb
+++ b/chrome/app/resources/locale_settings_he.xtb
@@ -56,8 +56,6 @@
<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 a5298ed..25cdec6 100644
--- a/chrome/app/resources/locale_settings_hi.xtb
+++ b/chrome/app/resources/locale_settings_hi.xtb
@@ -56,8 +56,6 @@
<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 1ae358b..fe19c43 100644
--- a/chrome/app/resources/locale_settings_hr.xtb
+++ b/chrome/app/resources/locale_settings_hr.xtb
@@ -56,8 +56,6 @@
<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 b1e392e..fb5f484 100644
--- a/chrome/app/resources/locale_settings_hu.xtb
+++ b/chrome/app/resources/locale_settings_hu.xtb
@@ -56,8 +56,6 @@
<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 d228aba..ee71e0c 100644
--- a/chrome/app/resources/locale_settings_id.xtb
+++ b/chrome/app/resources/locale_settings_id.xtb
@@ -56,8 +56,6 @@
<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 9c435e0..4069643 100644
--- a/chrome/app/resources/locale_settings_it.xtb
+++ b/chrome/app/resources/locale_settings_it.xtb
@@ -56,8 +56,6 @@
<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 463ed8f..33cf439 100644
--- a/chrome/app/resources/locale_settings_ja.xtb
+++ b/chrome/app/resources/locale_settings_ja.xtb
@@ -56,8 +56,6 @@
<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 e529366..916fd249 100644
--- a/chrome/app/resources/locale_settings_kn.xtb
+++ b/chrome/app/resources/locale_settings_kn.xtb
@@ -56,8 +56,6 @@
<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 0cc53ce..3215f51 100644
--- a/chrome/app/resources/locale_settings_ko.xtb
+++ b/chrome/app/resources/locale_settings_ko.xtb
@@ -56,8 +56,6 @@
<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 12fec10..910ca0f 100644
--- a/chrome/app/resources/locale_settings_lt.xtb
+++ b/chrome/app/resources/locale_settings_lt.xtb
@@ -56,8 +56,6 @@
<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 76a2438..ffcc54a 100644
--- a/chrome/app/resources/locale_settings_lv.xtb
+++ b/chrome/app/resources/locale_settings_lv.xtb
@@ -56,8 +56,6 @@
<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 40dcf21..801dc54 100644
--- a/chrome/app/resources/locale_settings_ml.xtb
+++ b/chrome/app/resources/locale_settings_ml.xtb
@@ -56,8 +56,6 @@
<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 bf19eac..a2f551d 100644
--- a/chrome/app/resources/locale_settings_mr.xtb
+++ b/chrome/app/resources/locale_settings_mr.xtb
@@ -56,8 +56,6 @@
<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 0f9ee3d..4450050 100644
--- a/chrome/app/resources/locale_settings_nb.xtb
+++ b/chrome/app/resources/locale_settings_nb.xtb
@@ -56,8 +56,6 @@
<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 9dabd67..337d381 100644
--- a/chrome/app/resources/locale_settings_nl.xtb
+++ b/chrome/app/resources/locale_settings_nl.xtb
@@ -56,8 +56,6 @@
<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 162f729..a3f800f 100644
--- a/chrome/app/resources/locale_settings_or.xtb
+++ b/chrome/app/resources/locale_settings_or.xtb
@@ -56,8 +56,6 @@
<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 e972968..724eb4a 100644
--- a/chrome/app/resources/locale_settings_pl.xtb
+++ b/chrome/app/resources/locale_settings_pl.xtb
@@ -56,8 +56,6 @@
<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 39d440f3..5f94850 100644
--- a/chrome/app/resources/locale_settings_pt-BR.xtb
+++ b/chrome/app/resources/locale_settings_pt-BR.xtb
@@ -56,8 +56,6 @@
<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 f6d7e90..50b7fc6 100644
--- a/chrome/app/resources/locale_settings_pt-PT.xtb
+++ b/chrome/app/resources/locale_settings_pt-PT.xtb
@@ -56,8 +56,6 @@
<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 24e74e6..ff04829 100644
--- a/chrome/app/resources/locale_settings_ro.xtb
+++ b/chrome/app/resources/locale_settings_ro.xtb
@@ -56,8 +56,6 @@
<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 b045e37..f52cdf7 100644
--- a/chrome/app/resources/locale_settings_ru.xtb
+++ b/chrome/app/resources/locale_settings_ru.xtb
@@ -56,8 +56,6 @@
<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 07f6ad2..be21c7a 100644
--- a/chrome/app/resources/locale_settings_sk.xtb
+++ b/chrome/app/resources/locale_settings_sk.xtb
@@ -56,8 +56,6 @@
<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 aa43761..9b822bf 100644
--- a/chrome/app/resources/locale_settings_sl.xtb
+++ b/chrome/app/resources/locale_settings_sl.xtb
@@ -56,8 +56,6 @@
<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 69bf85c..b76ad39 100644
--- a/chrome/app/resources/locale_settings_sr.xtb
+++ b/chrome/app/resources/locale_settings_sr.xtb
@@ -56,8 +56,6 @@
<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 bada285..a6ef6f9 100644
--- a/chrome/app/resources/locale_settings_sv.xtb
+++ b/chrome/app/resources/locale_settings_sv.xtb
@@ -56,8 +56,6 @@
<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 5e343ce..982d830 100644
--- a/chrome/app/resources/locale_settings_ta.xtb
+++ b/chrome/app/resources/locale_settings_ta.xtb
@@ -56,8 +56,6 @@
<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 6b362fc..39a19dc 100644
--- a/chrome/app/resources/locale_settings_te.xtb
+++ b/chrome/app/resources/locale_settings_te.xtb
@@ -56,8 +56,6 @@
<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 8d10d23..5e44c6b 100644
--- a/chrome/app/resources/locale_settings_th.xtb
+++ b/chrome/app/resources/locale_settings_th.xtb
@@ -56,8 +56,6 @@
<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 f82b1d4..a83ea15 100644
--- a/chrome/app/resources/locale_settings_tr.xtb
+++ b/chrome/app/resources/locale_settings_tr.xtb
@@ -56,8 +56,6 @@
<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 7ed6faa..bbf3d3e 100644
--- a/chrome/app/resources/locale_settings_uk.xtb
+++ b/chrome/app/resources/locale_settings_uk.xtb
@@ -56,8 +56,6 @@
<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 ad2c34e..3e85baf9 100644
--- a/chrome/app/resources/locale_settings_vi.xtb
+++ b/chrome/app/resources/locale_settings_vi.xtb
@@ -56,8 +56,6 @@
<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 8fc3416..52772fe 100644
--- a/chrome/app/resources/locale_settings_zh-CN.xtb
+++ b/chrome/app/resources/locale_settings_zh-CN.xtb
@@ -56,8 +56,6 @@
<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 56db9bd..d04ed71 100644
--- a/chrome/app/resources/locale_settings_zh-TW.xtb
+++ b/chrome/app/resources/locale_settings_zh-TW.xtb
@@ -56,8 +56,6 @@
<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/browser.cc b/chrome/browser/browser.cc
index d6a51ab..13ca661 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -284,12 +284,9 @@ void Browser::CreateBrowserWindow() {
return;
if (local_state->IsPrefRegistered(prefs::kShouldShowFirstRunBubble) &&
local_state->GetBoolean(prefs::kShouldShowFirstRunBubble)) {
- bool show_OEM_bubble = (local_state->
- IsPrefRegistered(prefs::kShouldUseOEMFirstRunBubble) &&
- local_state->GetBoolean(prefs::kShouldUseOEMFirstRunBubble));
// Reset the preference so we don't show the bubble for subsequent windows.
local_state->ClearPref(prefs::kShouldShowFirstRunBubble);
- window_->GetLocationBar()->ShowFirstRunBubble(show_OEM_bubble);
+ window_->GetLocationBar()->ShowFirstRunBubble();
}
FindBar* find_bar = BrowserWindow::CreateFindBar(this);
diff --git a/chrome/browser/first_run.cc b/chrome/browser/first_run.cc
index 3a24488..7dbb3df 100644
--- a/chrome/browser/first_run.cc
+++ b/chrome/browser/first_run.cc
@@ -266,9 +266,6 @@ 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())
@@ -643,18 +640,6 @@ 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 737cd00..d11e0b4 100644
--- a/chrome/browser/first_run.h
+++ b/chrome/browser/first_run.h
@@ -76,11 +76,6 @@ 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 218f65c..70a06d5 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(bool use_OEM_bubble) = 0;
+ virtual void ShowFirstRunBubble() = 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 df5000e..0ca491c 100644
--- a/chrome/browser/views/first_run_bubble.cc
+++ b/chrome/browser/views/first_run_bubble.cc
@@ -16,10 +16,8 @@
#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"
@@ -31,17 +29,6 @@ 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();
@@ -60,18 +47,11 @@ std::wstring GetDefaultSearchEngineName(Profile* profile) {
} // namespace
-// 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 {
+// 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 {
public:
FirstRunBubbleView(FirstRunBubble* bubble_window, Profile* profile)
: bubble_window_(bubble_window),
@@ -123,6 +103,7 @@ class FirstRunBubbleView : public FirstRunBubbleViewBase {
keep_button_->RequestFocus();
}
+ // Overridden from ButtonListener.
virtual void ButtonPressed(views::Button* sender) {
bubble_window_->Close();
if (change_button_ == sender) {
@@ -134,6 +115,7 @@ class FirstRunBubbleView : public FirstRunBubbleViewBase {
}
}
+ // Overridden from views::View.
virtual void Layout() {
gfx::Size canvas = GetPreferredSize();
@@ -175,6 +157,7 @@ class FirstRunBubbleView : public FirstRunBubbleViewBase {
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,
@@ -207,111 +190,6 @@ class FirstRunBubbleView : public FirstRunBubbleViewBase {
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;
@@ -323,6 +201,8 @@ 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,
@@ -330,7 +210,6 @@ void FirstRunBubble::OnActivate(UINT action, BOOL minimized, HWND window) {
&FirstRunBubble::EnableParent),
kLingerTime);
}
-
InfoBubble::OnActivate(action, minimized, window);
}
@@ -347,14 +226,9 @@ void FirstRunBubble::InfoBubbleClosing(InfoBubble* info_bubble,
// static
FirstRunBubble* FirstRunBubble::Show(Profile* profile, HWND parent_hwnd,
- const gfx::Rect& position_relative_to,
- bool use_OEM_bubble) {
+ const gfx::Rect& position_relative_to) {
FirstRunBubble* window = new FirstRunBubble();
- FirstRunBubbleViewBase* view = NULL;
- if (use_OEM_bubble)
- view = new FirstRunOEMBubbleView(window, profile);
- else
- view = new FirstRunBubbleView(window, profile);
+ FirstRunBubbleView* 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 598362b..d921987 100644
--- a/chrome/browser/views/first_run_bubble.h
+++ b/chrome/browser/views/first_run_bubble.h
@@ -8,15 +8,14 @@
#include "base/task.h"
#include "chrome/browser/views/info_bubble.h"
-class FirstRunBubbleViewBase;
+class FirstRunBubbleView;
class Profile;
class FirstRunBubble : public InfoBubble,
public InfoBubbleDelegate {
public:
static FirstRunBubble* Show(Profile* profile, HWND parent_hwnd,
- const gfx::Rect& position_relative_to,
- bool use_OEM_bubble);
+ const gfx::Rect& position_relative_to);
FirstRunBubble()
: enable_window_method_factory_(this),
@@ -30,7 +29,7 @@ class FirstRunBubble : public InfoBubble,
enable_window_method_factory_.RevokeAll();
}
- void set_view(FirstRunBubbleViewBase* view) { view_ = view; }
+ void set_view(FirstRunBubbleView* view) { view_ = view; }
// Overridden from InfoBubble:
virtual void OnActivate(UINT action, BOOL minimized, HWND window);
@@ -50,7 +49,7 @@ class FirstRunBubble : public InfoBubble,
ScopedRunnableMethodFactory<FirstRunBubble> enable_window_method_factory_;
// The view inside the FirstRunBubble.
- FirstRunBubbleViewBase* view_;
+ FirstRunBubbleView* 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 83c23c9..415334e 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(bool use_OEM_bubble) {
+void LocationBarView::ShowFirstRunBubbleInternal() {
if (!location_entry_view_)
return;
if (!location_entry_view_->GetWidget()->IsActive()) {
@@ -965,7 +965,7 @@ void LocationBarView::ShowFirstRunBubbleInternal(bool use_OEM_bubble) {
FirstRunBubble::Show(profile_,
location_entry_view_->GetRootView()->GetWidget()->GetNativeView(),
- bounds, use_OEM_bubble);
+ bounds);
}
// LocationBarImageView---------------------------------------------------------
@@ -1169,10 +1169,10 @@ bool LocationBarView::OverrideAccelerator(
////////////////////////////////////////////////////////////////////////////////
// LocationBarView, LocationBar implementation:
-void LocationBarView::ShowFirstRunBubble(bool use_OEM_bubble) {
+void LocationBarView::ShowFirstRunBubble() {
// We wait 30 milliseconds to open. It allows less flicker.
Task* task = first_run_bubble_.NewRunnableMethod(
- &LocationBarView::ShowFirstRunBubbleInternal, use_OEM_bubble);
+ &LocationBarView::ShowFirstRunBubbleInternal);
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 e81c5fc..b0648d7 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(bool use_OEM_bubble);
+ virtual void ShowFirstRunBubble();
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(bool use_OEM_bubble);
+ void ShowFirstRunBubbleInternal();
// Current profile. Not owned by us.
Profile* profile_;
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index 9dd08c8..f414d27 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -462,12 +462,6 @@ 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 5979204..83fdfd1 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -166,7 +166,6 @@ 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/util/master_preferences.cc b/chrome/installer/util/master_preferences.cc
index 9e440af..d376456 100644
--- a/chrome/installer/util/master_preferences.cc
+++ b/chrome/installer/util/master_preferences.cc
@@ -69,8 +69,6 @@ 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) {
@@ -111,8 +109,6 @@ 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 46513e9..14426f1 100644
--- a/chrome/installer/util/master_preferences.h
+++ b/chrome/installer/util/master_preferences.h
@@ -53,9 +53,7 @@ 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,
- // Use a smaller OEM info bubble on first run.
- MASTER_PROFILE_OEM_FIRST_RUN_BUBBLE = 0x1 << 15
+ MASTER_PROFILE_ALT_SHORTCUT_TXT = 0x1 << 14
};
// The master preferences is a JSON file with the same entries as the
@@ -103,7 +101,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 95ce2c1..d347837 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(bool use_OEM_bubble) {}
+ virtual void ShowFirstRunBubble() {}
virtual std::wstring GetInputString() const { return input_string_; }
virtual WindowOpenDisposition GetWindowOpenDisposition() const {
return disposition_;