Change string used in First Run bubble to add a mention of the search engine chosen.

BUG=46716
TEST=new first run bubble after first run import mentions the search engine: "Search using Google from right here"
Review URL: http://codereview.chromium.org/2817009

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

3 files changed, 14 insertions, 5 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 2b72104..5f10677 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -5356,6 +5356,11 @@ Keep your key file in a safe place. You will need it to create new versions of y
         Try it out - type "orchids" and press Enter.
       </message>
 
+      <!-- First run bubble popup with new search engine dialog -->
+      <message name="IDS_FR_SE_BUBBLE_TITLE" desc="Bubble-like popup dialog title">
+        Search using <ph name="SEARCH_ENGINE">$1<ex>Google</ex></ph> from right here
+      </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 82eebed..a5710f7 100644
--- a/chrome/app/resources/locale_settings.grd
+++ b/chrome/app/resources/locale_settings.grd
@@ -489,7 +489,7 @@
       <!-- The width and height of the First Run Omnibox Information minimal -->
       <!-- bubble in characters and lines (See above). -->
       <message name="IDS_FIRSTRUN_MINIMAL_BUBBLE_DIALOG_WIDTH_CHARS" use_name_for_id="true">
-        62
+        82
       </message>
       <message name="IDS_FIRSTRUN_MINIMAL_BUBBLE_DIALOG_HEIGHT_LINES" use_name_for_id="true">
         5
diff --git a/chrome/browser/views/first_run_bubble.cc b/chrome/browser/views/first_run_bubble.cc
index 141a12f..2c6bcf9 100644
--- a/chrome/browser/views/first_run_bubble.cc
+++ b/chrome/browser/views/first_run_bubble.cc
@@ -385,7 +385,7 @@ void FirstRunOEMBubbleView::FocusWillChange(View* focused_before,
 
 class FirstRunMinimalBubbleView : public FirstRunBubbleViewBase {
  public:
-  explicit FirstRunMinimalBubbleView(FirstRunBubble* bubble_window);
+  FirstRunMinimalBubbleView(FirstRunBubble* bubble_window, Profile* profile);
 
  private:
   virtual ~FirstRunMinimalBubbleView() { }
@@ -403,6 +403,7 @@ class FirstRunMinimalBubbleView : public FirstRunBubbleViewBase {
   virtual void FocusWillChange(View* focused_before, View* focused_now);
 
   FirstRunBubble* bubble_window_;
+  Profile* profile_;
   views::Label* label1_;
   views::Label* label2_;
 
@@ -410,14 +411,17 @@ class FirstRunMinimalBubbleView : public FirstRunBubbleViewBase {
 };
 
 FirstRunMinimalBubbleView::FirstRunMinimalBubbleView(
-    FirstRunBubble* bubble_window)
+    FirstRunBubble* bubble_window,
+    Profile* profile)
     : bubble_window_(bubble_window),
+      profile_(profile),
       label1_(NULL),
       label2_(NULL) {
   const gfx::Font& font =
       ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::MediumFont);
 
-  label1_ = new views::Label(l10n_util::GetString(IDS_FR_BUBBLE_TITLE));
+  label1_ = new views::Label(l10n_util::GetStringF(IDS_FR_SE_BUBBLE_TITLE,
+      GetDefaultSearchEngineName(profile_)));
   label1_->SetFont(font.DeriveFont(3, gfx::Font::BOLD));
   label1_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   AddChildView(label1_);
@@ -488,7 +492,7 @@ FirstRunBubble* FirstRunBubble::Show(Profile* profile,
       view = new FirstRunBubbleView(window, profile);
       break;
     case FirstRun::MINIMALBUBBLE:
-      view = new FirstRunMinimalBubbleView(window);
+      view = new FirstRunMinimalBubbleView(window, profile);
       break;
     default:
       NOTREACHED();