Remove wstrings from bookmarks, part 12.

chrome/browser/language_combobox_model.h

 // Copyright (c) 2009 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.
 
 #ifndef CHROME_BROWSER_LANGUAGE_COMBOBOX_MODEL_H_
 #define CHROME_BROWSER_LANGUAGE_COMBOBOX_MODEL_H_
 #pragma once
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "app/combobox_model.h"
 #include "base/basictypes.h"
+#include "base/string16.h"
 
 class Profile;
 
 ///////////////////////////////////////////////////////////////////////////////
 // LanguageList
 //  Provides code to enumerate locale names for language selection lists.
 //  To be used by combobox, menu or other models.
 class LanguageList {
  public:
   struct LocaleData {
@@ skipping 45 matching lines @@
 class LanguageComboboxModel : public LanguageList, public ComboboxModel {
  public:
   LanguageComboboxModel();
 
   // Temporary compatibility constructor.
   LanguageComboboxModel(Profile* profile,
                         const std::vector<std::string>& locale_codes);
 
   virtual ~LanguageComboboxModel() {}
 
-  virtual int GetItemCount() { return get_languages_count(); }
-
-  virtual std::wstring GetItemAt(int index) { return GetLanguageNameAt(index); }
+  virtual int GetItemCount();
+  virtual string16 GetItemAt(int index);
 
   // Returns the index of the language currently specified in the user's
   // preference file.  Note that it's possible for language A to be picked
   // while chrome is currently in language B if the user specified language B
   // via --lang.  Since --lang is not a persistent setting, it seems that it
   // shouldn't be reflected in this combo box.  We return -1 if the value in
   // the pref doesn't map to a know language (possible if the user edited the
   // prefs file manually).
   int GetSelectedLanguageIndex(const std::string& prefs);
 
  private:
   // Profile.
   Profile* profile_;
 
   DISALLOW_COPY_AND_ASSIGN(LanguageComboboxModel);
 };
 
 #endif  // CHROME_BROWSER_LANGUAGE_COMBOBOX_MODEL_H_