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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/login/keyboard_switch_menu.cc

Issue 5990008: Remove wstring from l10n_util. Part 1.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years 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
« chrome/browser/chromeos/input_method/input_method_util.cc ('K') | « chrome/browser/chromeos/login/keyboard_switch_menu.h ('k') | chrome/browser/chromeos/login/language_switch_menu.h » ('j') | chrome/browser/language_combobox_model.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/keyboard_switch_menu.cc
===================================================================
--- chrome/browser/chromeos/login/keyboard_switch_menu.cc (revision 70069)
+++ chrome/browser/chromeos/login/keyboard_switch_menu.cc (working copy)
@@ -49,11 +49,11 @@
input_method_menu().RunMenuAt(new_pt, views::Menu2::ALIGN_TOPLEFT);
}
-std::wstring KeyboardSwitchMenu::GetCurrentKeyboardName() const {
+string16 KeyboardSwitchMenu::GetCurrentKeyboardName() const {
const int count = GetItemCount();
for (int i = 0; i < count; ++i) {
if (IsItemCheckedAt(i))
- return UTF16ToWide(GetLabelAt(i));
+ return GetLabelAt(i);
}
VLOG(1) << "The input method menu is not ready yet. Show a language name "
"that matches the hardware keyboard layout";
« chrome/browser/chromeos/input_method/input_method_util.cc ('K') | « chrome/browser/chromeos/login/keyboard_switch_menu.h ('k') | chrome/browser/chromeos/login/language_switch_menu.h » ('j') | chrome/browser/language_combobox_model.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698