Remove wstring from l10n_util. Part 7....

chrome/browser/ui/views/first_run_search_engine_view.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_search_engine_view.h"
 
 #include <algorithm>
 #include <map>
 #include <vector>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/i18n/rtl.h"
 #include "base/rand_util.h"
 #include "base/time.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/search_engine_type.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/ui/options/options_window.h"
 #include "gfx/canvas.h"
 #include "gfx/font.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/google_chrome_strings.h"
@@ skipping 20 matching lines @@
 const int kSmallLogoHeight = 88;
 
 // Used to pad text label height so it fits nicely in view.
 const int kLabelPadding = 25;
 
 }  // namespace
 
 SearchEngineChoice::SearchEngineChoice(views::ButtonListener* listener,
                                        const TemplateURL* search_engine,
                                        bool use_small_logos)
-    : NativeButton(listener, l10n_util::GetString(IDS_FR_SEARCH_CHOOSE)),
+    : NativeButton(
+          listener,
+          UTF16ToWide(l10n_util::GetStringUTF16(IDS_FR_SEARCH_CHOOSE))),
       is_image_label_(false),
       search_engine_(search_engine),
       slot_(0) {
   bool use_images = false;
 #if defined(GOOGLE_CHROME_BUILD)
   use_images = true;
 #endif
   int logo_id = search_engine_->logo_id();
   if (use_images && logo_id != kNoSearchEngineLogo) {
     is_image_label_ = true;
@@ skipping 219 matching lines @@
     background_image_->SetHorizontalAlignment(ImageView::LEADING);
   } else {
     background_image_->SetHorizontalAlignment(ImageView::TRAILING);
   }
 
   AddChildView(background_image_);
 
   int label_width = GetPreferredSize().width() - 2 * kPanelHorizMargin;
 
   // Add title and text asking the user to choose a search engine:
-  title_label_ = new Label(l10n_util::GetString(
-      IDS_FR_SEARCH_MAIN_LABEL));
+  title_label_ = new Label(UTF16ToWide(l10n_util::GetStringUTF16(
+      IDS_FR_SEARCH_MAIN_LABEL)));
   title_label_->SetColor(SK_ColorBLACK);
   title_label_->SetFont(title_label_->font().DeriveFont(3, gfx::Font::BOLD));
   title_label_->SetMultiLine(true);
   title_label_->SetHorizontalAlignment(Label::ALIGN_LEFT);
   title_label_->SizeToFit(label_width);
   AddChildView(title_label_);
 
-  text_label_ = new Label(l10n_util::GetStringF(IDS_FR_SEARCH_TEXT,
-      l10n_util::GetString(IDS_PRODUCT_NAME)));
+  text_label_ = new Label(UTF16ToWide(l10n_util::GetStringFUTF16(
+      IDS_FR_SEARCH_TEXT,
+      l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))));
   text_label_->SetColor(SK_ColorBLACK);
   text_label_->SetFont(text_label_->font().DeriveFont(1, gfx::Font::NORMAL));
   text_label_->SetMultiLine(true);
   text_label_->SetHorizontalAlignment(Label::ALIGN_LEFT);
   text_label_->SizeToFit(label_width);
   AddChildView(text_label_);
 }
 
 void FirstRunSearchEngineView::Layout() {
   // Disable the close button.
@@ skipping 102 matching lines @@
                                            button_width, button_height);
     }
   }  // if (search_engine_choices.size() > 0)
 }
 
 AccessibilityTypes::Role FirstRunSearchEngineView::GetAccessibleRole() {
   return AccessibilityTypes::ROLE_ALERT;
 }
 
 std::wstring FirstRunSearchEngineView::GetWindowTitle() const {
-  return l10n_util::GetString(IDS_FIRSTRUN_DLG_TITLE);
+  return UTF16ToWide(l10n_util::GetStringUTF16(IDS_FIRSTRUN_DLG_TITLE));
 }