Remove wstring from l10n_util. Part 8, the last part....

chrome/browser/chromeos/options/options_window_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 "app/l10n_util.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/options/internet_page_view.h"
 #include "chrome/browser/chromeos/options/system_page_view.h"
 #include "chrome/browser/gtk/options/advanced_page_gtk.h"
@@ skipping 195 matching lines @@
 
   tabs_->SelectTabAt(static_cast<int>(page));
 
   // TODO(xiyuan): set highlight_group
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // OptionsWindowView, views::DialogDelegate implementation:
 
 std::wstring OptionsWindowView::GetWindowTitle() const {
-  return l10n_util::GetStringF(IDS_OPTIONS_DIALOG_TITLE,
-                               l10n_util::GetString(IDS_PRODUCT_NAME));
+  return UTF16ToWide(
+      l10n_util::GetStringFUTF16(IDS_OPTIONS_DIALOG_TITLE,
+                                 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
 }
 
 void OptionsWindowView::WindowClosing() {
   // Clear the static instance so that the next time ShowOptionsWindow() is
   // called a new window is opened.
   instance_ = NULL;
 }
 
 bool OptionsWindowView::Cancel() {
   OptionsPageView* selected_option_page = GetCurrentOptionsPageView();
@@ skipping 65 matching lines @@
   // to apply specific drawings for this widget.
   gtk_widget_set_name(GTK_WIDGET(notebook), "chromeos-options-tab");
 
   // Setup tab pages.
   int tab_index = 0;
 
   SystemPageView* system_page = new SystemPageView(profile_);
   system_page->set_background(views::Background::CreateSolidBackground(
       SK_ColorWHITE));
   tabs_->AddTabAtIndex(tab_index++,
-                       l10n_util::GetString(IDS_OPTIONS_SYSTEM_TAB_LABEL),
+                       UTF16ToWide(l10n_util::GetStringUTF16(
+                           IDS_OPTIONS_SYSTEM_TAB_LABEL)),
                        system_page, false);
 
   InternetPageView* internet_page = new InternetPageView(profile_);
   internet_page->set_background(views::Background::CreateSolidBackground(
       SK_ColorWHITE));
   tabs_->AddTabAtIndex(tab_index++,
-                       l10n_util::GetString(IDS_OPTIONS_INTERNET_TAB_LABEL),
+                       UTF16ToWide(l10n_util::GetStringUTF16(
+                           IDS_OPTIONS_INTERNET_TAB_LABEL)),
                        internet_page, false);
 
   tabs_->AddTabAtIndex(tab_index++,
-                       l10n_util::GetString(IDS_OPTIONS_GENERAL_TAB_LABEL),
+                       UTF16ToWide(l10n_util::GetStringUTF16(
+                           IDS_OPTIONS_GENERAL_TAB_LABEL)),
                        new GtkPreferencePageHost(
                            general_page_.get_page_widget()),
                        false);
 
   tabs_->AddTabAtIndex(tab_index++,
-                       l10n_util::GetString(IDS_OPTIONS_CONTENT_TAB_LABEL),
+                       UTF16ToWide(l10n_util::GetStringUTF16(
+                           IDS_OPTIONS_CONTENT_TAB_LABEL)),
                        new GtkPreferencePageHost(
                            content_page_.get_page_widget()),
                        false);
 
   tabs_->AddTabAtIndex(tab_index++,
-                       l10n_util::GetString(IDS_OPTIONS_ADVANCED_TAB_LABEL),
+                       UTF16ToWide(l10n_util::GetStringUTF16(
+                           IDS_OPTIONS_ADVANCED_TAB_LABEL)),
                        new GtkPreferencePageHost(
                            advanced_page_.get_page_widget()),
                        false);
 
   DCHECK(tabs_->GetTabCount() == OPTIONS_PAGE_COUNT);
 
   initialized_ = true;
 }
 
 OptionsPageView* OptionsWindowView::GetCurrentOptionsPageView() const {
@@ skipping 41 matching lines @@
   // a new one for the current active browser.
   chromeos::CloseOptionsWindow();
 
   OptionsWindowView::instance_ = new OptionsWindowView(profile);
   browser::CreateViewsWindow(chromeos::GetOptionsViewParent(),
                              gfx::Rect(),
                              OptionsWindowView::instance_);
 
   OptionsWindowView::instance_->ShowOptionsPage(page, highlight_group);
 }