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

Unified Diff: chrome/browser/chromeos/options/language_config_util.h

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_config_util.h
diff --git a/chrome/browser/chromeos/options/language_config_util.h b/chrome/browser/chromeos/options/language_config_util.h
index 21a5705fe9a8cd817d96b2cafc14970f05e73b85..6f262cff88280fc962bca65d88b00774518ecf24 100644
--- a/chrome/browser/chromeos/options/language_config_util.h
+++ b/chrome/browser/chromeos/options/language_config_util.h
@@ -7,6 +7,7 @@
#pragma once
#include "app/combobox_model.h"
+#include "base/string16.h"
#include "chrome/browser/chromeos/language_preferences.h"
#include "views/controls/combobox/combobox.h"
@@ -38,13 +39,13 @@ class LanguageComboboxModel : public ComboboxModel {
}
// Implements ComboboxModel interface.
- virtual std::wstring GetItemAt(int index) {
+ virtual string16 GetItemAt(int index) {
if (index < 0 || index >= num_items_) {
LOG(ERROR) << "Index is out of bounds: " << index;
- return L"";
+ return string16();
}
const int message_id = (pref_data_->values_and_ids)[index].item_message_id;
- return l10n_util::GetString(message_id);
+ return l10n_util::GetStringUTF16(message_id);
}
// Gets a label for the combobox like "Input mode". This function is NOT part

Powered by Google App Engine
This is Rietveld 408576698