chrome/browser/chromeos/preferences.cc - Issue 10416028: Rename chromeos::input_method::kLeftControl to chromeos::input_method::kControl.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/preferences.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

« no previous file with comments | « chrome/browser/chromeos/input_method/xkeyboard_unittest.cc ('k') | chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/preferences.cc

diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc

index 0c42f481e565736d7c557dba971f2536265f03da..376630b41bc3a91f244b0209f16b3a4b5311334e 100644

--- a/chrome/browser/chromeos/preferences.cc

+++ b/chrome/browser/chromeos/preferences.cc

@@ -217,10 +217,10 @@ void Preferences::RegisterUserPrefs(PrefService* prefs) {

input_method::kSearchKey,

PrefService::SYNCABLE_PREF);

prefs->RegisterIntegerPref(prefs::kLanguageXkbRemapControlKeyTo,

- input_method::kLeftControlKey,

+ input_method::kControlKey,

PrefService::SYNCABLE_PREF);

prefs->RegisterIntegerPref(prefs::kLanguageXkbRemapAltKeyTo,

- input_method::kLeftAltKey,

+ input_method::kAltKey,

PrefService::SYNCABLE_PREF);

// We don't sync the following keyboard prefs since they are not user-

// configurable.

@@ -678,11 +678,11 @@ void Preferences::UpdateModifierKeyMapping() {

input_method::ModifierKey(search_remap)));

modifier_map.push_back(

input_method::ModifierKeyPair(

- input_method::kLeftControlKey,

+ input_method::kControlKey,

input_method::ModifierKey(control_remap)));

modifier_map.push_back(

input_method::ModifierKeyPair(

- input_method::kLeftAltKey,

+ input_method::kAltKey,

input_method::ModifierKey(alt_remap)));

input_method_manager_->GetXKeyboard()->RemapModifierKeys(modifier_map);

} else {