Remove wstrings from bookmarks, part 12.

chrome/browser/views/options/general_page_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/options/general_page_view.h"
 
 #include "app/combobox_model.h"
 #include "app/l10n_util.h"
 #include "base/callback.h"
 #include "base/message_loop.h"
+#include "base/string16.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/custom_home_pages_table_model.h"
 #include "chrome/browser/dom_ui/new_tab_ui.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/session_startup_pref.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
@@ skipping 36 matching lines @@
  public:
   explicit SearchEngineListModel(Profile* profile);
   virtual ~SearchEngineListModel();
 
   // Sets the Combobox. SearchEngineListModel needs a handle to the Combobox
   // so that when the TemplateURLModel changes the combobox can be updated.
   void SetCombobox(views::Combobox* combobox);
 
   // ComboboxModel overrides:
   virtual int GetItemCount();
-  virtual std::wstring GetItemAt(int index);
+  virtual string16 GetItemAt(int index);
 
   // Returns the TemplateURL at the specified index.
   const TemplateURL* GetTemplateURLAt(int index);
 
   TemplateURLModel* model() { return template_url_model_; }
 
  private:
   // TemplateURLModelObserver methods.
   virtual void OnTemplateURLModelChanged();
 
@@ skipping 36 matching lines @@
   if (template_url_model_ && template_url_model_->loaded())
     ChangeComboboxSelection();
   else
     combobox_->SetEnabled(false);
 }
 
 int SearchEngineListModel::GetItemCount() {
   return static_cast<int>(template_urls_.size());
 }
 
-std::wstring SearchEngineListModel::GetItemAt(int index) {
+string16 SearchEngineListModel::GetItemAt(int index) {
   DCHECK(index < GetItemCount());
-  return template_urls_[index]->short_name();
+  return WideToUTF16Hack(template_urls_[index]->short_name());
 }
 
 const TemplateURL* SearchEngineListModel::GetTemplateURLAt(int index) {
   DCHECK(index >= 0 && index < static_cast<int>(template_urls_.size()));
   return template_urls_[static_cast<int>(index)];
 }
 
 void SearchEngineListModel::OnTemplateURLModelChanged() {
   ResetContents();
 }
@@ skipping 659 matching lines @@
   }
   homepage_use_url_textfield_->SetEnabled(enabled);
   homepage_use_url_textfield_->SetReadOnly(!enabled);
 }
 
 void GeneralPageView::SetDefaultSearchProvider() {
   const int index = default_search_engine_combobox_->selected_item();
   default_search_engines_model_->model()->SetDefaultSearchProvider(
       default_search_engines_model_->GetTemplateURLAt(index));
 }