Remove wstring from l10n_util. Part 7....

chrome/browser/ui/views/keyword_editor_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/keyword_editor_view.h"
 
 #include <vector>
 
 #include "app/l10n_util.h"
 #include "base/stl_util-inl.h"
@@ skipping 108 matching lines @@
   return gfx::Size(views::Window::GetLocalizedContentsSize(
       IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS,
       IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES));
 }
 
 bool KeywordEditorView::CanResize() const {
   return true;
 }
 
 std::wstring KeywordEditorView::GetWindowTitle() const {
-  return l10n_util::GetString(IDS_SEARCH_ENGINES_EDITOR_WINDOW_TITLE);
+  return UTF16ToWide(
+      l10n_util::GetStringUTF16(IDS_SEARCH_ENGINES_EDITOR_WINDOW_TITLE));
 }
 
 std::wstring KeywordEditorView::GetWindowName() const {
   return UTF8ToWide(prefs::kKeywordEditorWindowPlacement);
 }
 
 int KeywordEditorView::GetDialogButtons() const {
   return MessageBoxFlags::DIALOGBUTTON_CANCEL;
 }
 
@@ skipping 18 matching lines @@
                   TableColumn::LEFT, -1, .75));
   columns.back().sortable = true;
   columns.push_back(
       TableColumn(IDS_SEARCH_ENGINES_EDITOR_KEYWORD_COLUMN,
                   TableColumn::LEFT, -1, .25));
   columns.back().sortable = true;
   table_view_ = new views::TableView(controller_->table_model(), columns,
       views::ICON_AND_TEXT, false, true, true);
   table_view_->SetObserver(this);
 
-  add_button_ = new views::NativeButton(
-      this, l10n_util::GetString(IDS_SEARCH_ENGINES_EDITOR_NEW_BUTTON));
+  add_button_ = new views::NativeButton(this, UTF16ToWide(
+      l10n_util::GetStringUTF16(IDS_SEARCH_ENGINES_EDITOR_NEW_BUTTON)));
   add_button_->SetEnabled(controller_->loaded());
   add_button_->AddAccelerator(
       views::Accelerator(app::VKEY_A, false, false, true));
   add_button_->SetAccessibleKeyboardShortcut(L"A");
 
-  edit_button_ = new views::NativeButton(
-      this, l10n_util::GetString(IDS_SEARCH_ENGINES_EDITOR_EDIT_BUTTON));
+  edit_button_ = new views::NativeButton(this, UTF16ToWide(
+      l10n_util::GetStringUTF16(IDS_SEARCH_ENGINES_EDITOR_EDIT_BUTTON)));
   edit_button_->SetEnabled(false);
 
-  remove_button_ = new views::NativeButton(
-      this, l10n_util::GetString(IDS_SEARCH_ENGINES_EDITOR_REMOVE_BUTTON));
+  remove_button_ = new views::NativeButton(this, UTF16ToWide(
+      l10n_util::GetStringUTF16(IDS_SEARCH_ENGINES_EDITOR_REMOVE_BUTTON)));
   remove_button_->SetEnabled(false);
   remove_button_->AddAccelerator(
       views::Accelerator(app::VKEY_R, false, false, true));
   remove_button_->SetAccessibleKeyboardShortcut(L"R");
 
   make_default_button_ = new views::NativeButton(
       this,
-      l10n_util::GetString(IDS_SEARCH_ENGINES_EDITOR_MAKE_DEFAULT_BUTTON));
+      UTF16ToWide(l10n_util::GetStringUTF16(
+          IDS_SEARCH_ENGINES_EDITOR_MAKE_DEFAULT_BUTTON)));
   make_default_button_->SetEnabled(false);
 
   InitLayoutManager();
 }
 
 void KeywordEditorView::InitLayoutManager() {
   const int related_x = kRelatedControlHorizontalSpacing;
   const int related_y = kRelatedControlVerticalSpacing;
   const int unrelated_y = kUnrelatedControlVerticalSpacing;
 
@@ skipping 98 matching lines @@
   add_button_->SetEnabled(controller_->loaded());
 }
 
 void KeywordEditorView::MakeDefaultTemplateURL() {
   int new_index =
       controller_->MakeDefaultTemplateURL(table_view_->FirstSelectedRow());
   if (new_index >= 0)
     table_view_->Select(new_index);
   default_chosen_ = true;
 }