Remove wstring from l10n_util. Part 7....

chrome/browser/ui/views/first_run_bubble.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/views/first_run_bubble.h"
 
 #include "app/gfx/font_util.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/win/hwnd_util.h"
@@ skipping 82 matching lines @@
     : bubble_window_(bubble_window),
       label1_(NULL),
       label2_(NULL),
       label3_(NULL),
       keep_button_(NULL),
       change_button_(NULL),
       profile_(profile) {
   const gfx::Font& font =
       ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::MediumFont);
 
-  label1_ = new views::Label(l10n_util::GetString(IDS_FR_BUBBLE_TITLE));
+  label1_ = new views::Label(
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_FR_BUBBLE_TITLE)));
   label1_->SetFont(font.DeriveFont(3, gfx::Font::BOLD));
   label1_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   AddChildView(label1_);
 
   gfx::Size ps = GetPreferredSize();
 
-  label2_ = new views::Label(l10n_util::GetString(IDS_FR_BUBBLE_SUBTEXT));
+  label2_ = new views::Label(
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_FR_BUBBLE_SUBTEXT)));
   label2_->SetMultiLine(true);
   label2_->SetFont(font);
   label2_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   label2_->SizeToFit(ps.width() - kBubblePadding * 2);
   AddChildView(label2_);
 
-  std::wstring question_str = l10n_util::GetStringF(IDS_FR_BUBBLE_QUESTION,
-      UTF16ToWideHack(GetDefaultSearchEngineName(profile)));
+  std::wstring question_str = UTF16ToWide(l10n_util::GetStringFUTF16(
+      IDS_FR_BUBBLE_QUESTION,
+      GetDefaultSearchEngineName(profile)));
   label3_ = new views::Label(question_str);
   label3_->SetMultiLine(true);
   label3_->SetFont(font);
   label3_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   label3_->SizeToFit(ps.width() - kBubblePadding * 2);
   AddChildView(label3_);
 
-  std::wstring keep_str = l10n_util::GetStringF(IDS_FR_BUBBLE_OK,
-      UTF16ToWideHack(GetDefaultSearchEngineName(profile)));
+  std::wstring keep_str = UTF16ToWide(l10n_util::GetStringFUTF16(
+      IDS_FR_BUBBLE_OK,
+      GetDefaultSearchEngineName(profile)));
   keep_button_ = new views::NativeButton(this, keep_str);
   keep_button_->SetIsDefault(true);
   AddChildView(keep_button_);
 
-  std::wstring change_str = l10n_util::GetString(IDS_FR_BUBBLE_CHANGE);
+  std::wstring change_str =
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_FR_BUBBLE_CHANGE));
   change_button_ = new views::NativeButton(this, change_str);
   AddChildView(change_button_);
 }
 
 void FirstRunBubbleView::BubbleShown() {
   keep_button_->RequestFocus();
 }
 
 void FirstRunBubbleView::ButtonPressed(views::Button* sender,
                                        const views::Event& event) {
@@ skipping 109 matching lines @@
                                              Profile* profile)
     : bubble_window_(bubble_window),
       label1_(NULL),
       label2_(NULL),
       label3_(NULL),
       close_button_(NULL),
       profile_(profile) {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   const gfx::Font& font = rb.GetFont(ResourceBundle::MediumFont);
 
-  label1_ = new views::Label(l10n_util::GetString(IDS_FR_OEM_BUBBLE_TITLE_1));
+  label1_ = new views::Label(
+      UTF16ToWide(l10n_util::GetStringUTF16(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_ = new views::Label(
+      UTF16ToWide(l10n_util::GetStringUTF16(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_ = new views::Label(
+      UTF16ToWide(l10n_util::GetStringUTF16(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,
@@ skipping 109 matching lines @@
 FirstRunMinimalBubbleView::FirstRunMinimalBubbleView(
     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::GetStringF(IDS_FR_SE_BUBBLE_TITLE,
-      UTF16ToWideHack(GetDefaultSearchEngineName(profile_))));
+  label1_ = new views::Label(UTF16ToWide(l10n_util::GetStringFUTF16(
+      IDS_FR_SE_BUBBLE_TITLE,
+      GetDefaultSearchEngineName(profile_))));
   label1_->SetFont(font.DeriveFont(3, gfx::Font::BOLD));
   label1_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   AddChildView(label1_);
 
   gfx::Size ps = GetPreferredSize();
 
-  label2_ = new views::Label(l10n_util::GetString(IDS_FR_BUBBLE_SUBTEXT));
+  label2_ = new views::Label(
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_FR_BUBBLE_SUBTEXT)));
   label2_->SetMultiLine(true);
   label2_->SetFont(font);
   label2_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   label2_->SizeToFit(ps.width() - kBubblePadding * 2);
   AddChildView(label2_);
 }
 
 void FirstRunMinimalBubbleView::BubbleShown() {
   RequestFocus();
 }
@@ skipping 104 matching lines @@
   if (::IsWindowEnabled(GetParent()))
     InfoBubble::OnActivate(action, minimized, window);
 }
 
 void FirstRunBubble::InfoBubbleClosing(InfoBubble* info_bubble,
                                        bool closed_by_escape) {
   // Make sure our parent window is re-enabled.
   if (!IsWindowEnabled(GetParent()))
     ::EnableWindow(GetParent(), true);
 }