Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3233)

Unified Diff: chrome/browser/chromeos/options/language_hangul_config_view.cc

Issue 3159031: Remove wstrings from bookmarks, part 12. (Closed)
Patch Set: rebased ToT Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/options/language_hangul_config_view.cc
diff --git a/chrome/browser/chromeos/options/language_hangul_config_view.cc b/chrome/browser/chromeos/options/language_hangul_config_view.cc
index 29991c6b6bd0cc648c987ccf3900d5748c359f66..14677f65d206d97a16731ab7647f1475ec93b806 100644
--- a/chrome/browser/chromeos/options/language_hangul_config_view.cc
+++ b/chrome/browser/chromeos/options/language_hangul_config_view.cc
@@ -6,6 +6,7 @@
#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"
@@ -43,12 +44,12 @@ class HangulKeyboardComboboxModel : public ComboboxModel {
}
// 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
« no previous file with comments | « chrome/browser/chromeos/options/language_config_util.h ('k') | chrome/browser/chromeos/options/system_page_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698