Remove wstrings from bookmarks, part 12.

chrome/browser/chromeos/options/language_hangul_config_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/chromeos/options/language_hangul_config_view.h"
 
 #include "app/combobox_model.h"
 #include "app/l10n_util.h"
+#include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/input_method_library.h"
 #include "chrome/browser/chromeos/language_preferences.h"
 #include "chrome/browser/chromeos/preferences.h"
 #include "chrome/browser/profile.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
@@ skipping 17 matching lines @@
           language_prefs::kHangulKeyboardNameIDPairs[i].keyboard_id));
     }
   }
 
   // Implements ComboboxModel interface.
   virtual int GetItemCount() {
     return static_cast<int>(layouts_.size());
   }
 
   // Implements ComboboxModel interface.
-  virtual std::wstring GetItemAt(int index) {
+  virtual string16 GetItemAt(int index) {
     if (index < 0 || index > GetItemCount()) {
       LOG(ERROR) << "Index is out of bounds: " << index;
-      return L"";
+      return string16();
     }
-    return UTF8ToWide(layouts_.at(index).first);
+    return UTF8ToUTF16(layouts_.at(index).first);
   }
 
   // Gets a keyboard layout ID (e.g. "2", "3f", ..) for an item at zero-origin
   // |index|. This function is NOT part of the ComboboxModel interface.
   std::string GetItemIDAt(int index) {
     if (index < 0 || index > GetItemCount()) {
       LOG(ERROR) << "Index is out of bounds: " << index;
       return "";
     }
     return layouts_.at(index).second;
@@ skipping 113 matching lines @@
 
 void LanguageHangulConfigView::NotifyPrefChanged() {
   const std::string id = keyboard_pref_.GetValue();
   const int index =
       hangul_keyboard_combobox_model_->GetIndexFromID(id);
   if (index >= 0)
     hangul_keyboard_combobox_->SetSelectedItem(index);
 }
 
 }  // namespace chromeos