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

Unified Diff: chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc

Issue 10416028: Rename chromeos::input_method::kLeftControl to chromeos::input_method::kControl. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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/ui/webui/chromeos/keyboard_overlay_ui.cc
diff --git a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc
index 1a548a2f2cc02d2a2418a70e2336f26023bc756c..64f12b7ca7db8a28bd0c5528267e7fc0ae03e8fb 100644
--- a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc
@@ -47,8 +47,8 @@ struct ModifierToLabel {
const char* label;
} kModifierToLabels[] = {
{chromeos::input_method::kSearchKey, "search"},
- {chromeos::input_method::kLeftControlKey, "ctrl"},
- {chromeos::input_method::kLeftAltKey, "alt"},
+ {chromeos::input_method::kControlKey, "ctrl"},
+ {chromeos::input_method::kAltKey, "alt"},
{chromeos::input_method::kVoidKey, "disabled"},
{chromeos::input_method::kCapsLockKey, "caps lock"},
};
@@ -288,10 +288,9 @@ void KeyboardOverlayHandler::GetLabelMap(const ListValue* args) {
ModifierMap modifier_map;
modifier_map[chromeos::input_method::kSearchKey] = static_cast<ModifierKey>(
pref_service->GetInteger(prefs::kLanguageXkbRemapSearchKeyTo));
- modifier_map[chromeos::input_method::kLeftControlKey] =
- static_cast<ModifierKey>(
- pref_service->GetInteger(prefs::kLanguageXkbRemapControlKeyTo));
- modifier_map[chromeos::input_method::kLeftAltKey] = static_cast<ModifierKey>(
+ modifier_map[chromeos::input_method::kControlKey] = static_cast<ModifierKey>(
+ pref_service->GetInteger(prefs::kLanguageXkbRemapControlKeyTo));
+ modifier_map[chromeos::input_method::kAltKey] = static_cast<ModifierKey>(
pref_service->GetInteger(prefs::kLanguageXkbRemapAltKeyTo));
DictionaryValue dict;
« no previous file with comments | « chrome/browser/chromeos/preferences.cc ('k') | chrome/browser/ui/webui/options2/chromeos/keyboard_handler2.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698