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

Unified Diff: chrome/browser/chromeos/events/event_rewriter.cc

Issue 1908683002: Replace OS_LEFT/RIGHT with META_LEFT/RIGHT (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 | « no previous file | chrome/browser/chromeos/events/event_rewriter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/events/event_rewriter.cc
diff --git a/chrome/browser/chromeos/events/event_rewriter.cc b/chrome/browser/chromeos/events/event_rewriter.cc
index 62595b877c6517307d9c4febd0f3ac3f0f7b0871..a8f0d1e0f91366f9626aa832755e073b41ac6d7f 100644
--- a/chrome/browser/chromeos/events/event_rewriter.cc
+++ b/chrome/browser/chromeos/events/event_rewriter.cc
@@ -95,7 +95,7 @@ const struct ModifierRemapping {
{ui::EF_COMMAND_DOWN,
input_method::kSearchKey,
prefs::kLanguageRemapSearchKeyTo,
- {ui::EF_COMMAND_DOWN, ui::DomCode::OS_LEFT, ui::DomKey::META,
+ {ui::EF_COMMAND_DOWN, ui::DomCode::META_LEFT, ui::DomKey::META,
ui::VKEY_LWIN}},
{ui::EF_ALT_DOWN,
input_method::kAltKey,
@@ -283,9 +283,9 @@ ui::DomCode RelocateModifier(ui::DomCode code, ui::DomKeyLocation location) {
case ui::DomCode::ALT_LEFT:
case ui::DomCode::ALT_RIGHT:
return right ? ui::DomCode::ALT_RIGHT : ui::DomCode::ALT_LEFT;
- case ui::DomCode::OS_LEFT:
- case ui::DomCode::OS_RIGHT:
- return right ? ui::DomCode::OS_RIGHT : ui::DomCode::OS_LEFT;
+ case ui::DomCode::META_LEFT:
+ case ui::DomCode::META_RIGHT:
+ return right ? ui::DomCode::META_RIGHT : ui::DomCode::META_LEFT;
default:
break;
}
@@ -755,8 +755,8 @@ bool EventRewriter::RewriteModifierKeys(const ui::KeyEvent& key_event,
remapped_key =
GetRemappedKey(prefs::kLanguageRemapCapsLockKeyTo, *pref_service);
break;
- case ui::DomCode::OS_LEFT:
- case ui::DomCode::OS_RIGHT:
+ case ui::DomCode::META_LEFT:
+ case ui::DomCode::META_RIGHT:
characteristic_flag = ui::EF_COMMAND_DOWN;
// Rewrite Command-L/R key presses on an Apple keyboard to Control.
if (IsAppleKeyboard()) {
« no previous file with comments | « no previous file | chrome/browser/chromeos/events/event_rewriter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698