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

Side by Side Diff: chrome/browser/chromeos/events/event_rewriter.cc

Issue 576413002: Reland Track the active ExtensionKeybindingRegistry and make it available to EventRewriter. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkcr
Patch Set: Created 6 years, 3 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 unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_commands_global_registry.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/events/event_rewriter.h" 5 #include "chrome/browser/chromeos/events/event_rewriter.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/sticky_keys/sticky_keys_controller.h" 9 #include "ash/sticky_keys/sticky_keys_controller.h"
10 #include "ash/wm/window_state.h" 10 #include "ash/wm/window_state.h"
11 #include "ash/wm/window_util.h" 11 #include "ash/wm/window_util.h"
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "base/prefs/pref_service.h" 15 #include "base/prefs/pref_service.h"
16 #include "base/strings/string_util.h" 16 #include "base/strings/string_util.h"
17 #include "base/sys_info.h" 17 #include "base/sys_info.h"
18 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" 18 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
19 #include "chrome/browser/extensions/extension_commands_global_registry.h"
19 #include "chrome/browser/profiles/profile_manager.h" 20 #include "chrome/browser/profiles/profile_manager.h"
20 #include "chrome/common/pref_names.h" 21 #include "chrome/common/pref_names.h"
21 #include "chromeos/chromeos_switches.h" 22 #include "chromeos/chromeos_switches.h"
22 #include "chromeos/ime/ime_keyboard.h" 23 #include "chromeos/ime/ime_keyboard.h"
23 #include "chromeos/ime/input_method_manager.h" 24 #include "chromeos/ime/input_method_manager.h"
24 #include "components/user_manager/user_manager.h" 25 #include "components/user_manager/user_manager.h"
25 #include "ui/events/event.h" 26 #include "ui/events/event.h"
26 #include "ui/events/event_utils.h" 27 #include "ui/events/event_utils.h"
27 #include "ui/events/keycodes/keyboard_code_conversion.h" 28 #include "ui/events/keycodes/keyboard_code_conversion.h"
28 #include "ui/wm/core/window_util.h" 29 #include "ui/wm/core/window_util.h"
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 bool IsISOLevel5ShiftUsedByCurrentInputMethod() { 98 bool IsISOLevel5ShiftUsedByCurrentInputMethod() {
98 // Since both German Neo2 XKB layout and Caps Lock depend on Mod3Mask, 99 // Since both German Neo2 XKB layout and Caps Lock depend on Mod3Mask,
99 // it's not possible to make both features work. For now, we don't remap 100 // it's not possible to make both features work. For now, we don't remap
100 // Mod3Mask when Neo2 is in use. 101 // Mod3Mask when Neo2 is in use.
101 // TODO(yusukes): Remove the restriction. 102 // TODO(yusukes): Remove the restriction.
102 input_method::InputMethodManager* manager = 103 input_method::InputMethodManager* manager =
103 input_method::InputMethodManager::Get(); 104 input_method::InputMethodManager::Get();
104 return manager->IsISOLevel5ShiftUsedByCurrentInputMethod(); 105 return manager->IsISOLevel5ShiftUsedByCurrentInputMethod();
105 } 106 }
106 107
108 bool IsExtensionCommandRegistered(const ui::KeyEvent& key_event) {
109 // Some keyboard events for ChromeOS get rewritten, such as:
110 // Search+Shift+Left gets converted to Shift+Home (BeginDocument).
111 // This doesn't make sense if the user has assigned that shortcut
112 // to an extension. Because:
113 // 1) The extension would, upon seeing a request for Ctrl+Shift+Home have
114 // to register for Shift+Home, instead.
115 // 2) The conversion is unnecessary, because Shift+Home (BeginDocument) isn't
116 // going to be executed.
117 // Therefore, we skip converting the accelerator if an extension has
118 // registered for this shortcut.
119 Profile* profile = ProfileManager::GetActiveUserProfile();
120 if (!profile || !extensions::ExtensionCommandsGlobalRegistry::Get(profile))
121 return false;
122
123 int modifiers = key_event.flags() & (ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN |
124 ui::EF_ALT_DOWN | ui::EF_COMMAND_DOWN);
125 ui::Accelerator accelerator(key_event.key_code(), modifiers);
126 return extensions::ExtensionCommandsGlobalRegistry::Get(profile)
127 ->IsRegistered(accelerator);
128 }
129
107 EventRewriter::DeviceType GetDeviceType(const std::string& device_name) { 130 EventRewriter::DeviceType GetDeviceType(const std::string& device_name) {
108 std::vector<std::string> tokens; 131 std::vector<std::string> tokens;
109 Tokenize(device_name, " .", &tokens); 132 Tokenize(device_name, " .", &tokens);
110 133
111 // If the |device_name| contains the two words, "apple" and "keyboard", treat 134 // If the |device_name| contains the two words, "apple" and "keyboard", treat
112 // it as an Apple keyboard. 135 // it as an Apple keyboard.
113 bool found_apple = false; 136 bool found_apple = false;
114 bool found_keyboard = false; 137 bool found_keyboard = false;
115 for (size_t i = 0; i < tokens.size(); ++i) { 138 for (size_t i = 0; i < tokens.size(); ++i) {
116 if (!found_apple && LowerCaseEqualsASCII(tokens[i], "apple")) 139 if (!found_apple && LowerCaseEqualsASCII(tokens[i], "apple"))
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 remapped_state->key_code = map.output_key_code; 376 remapped_state->key_code = map.output_key_code;
354 remapped_state->flags = (input.flags & ~map.input_flags) | map.output_flags; 377 remapped_state->flags = (input.flags & ~map.input_flags) | map.output_flags;
355 return true; 378 return true;
356 } 379 }
357 return false; 380 return false;
358 } 381 }
359 382
360 ui::EventRewriteStatus EventRewriter::RewriteKeyEvent( 383 ui::EventRewriteStatus EventRewriter::RewriteKeyEvent(
361 const ui::KeyEvent& key_event, 384 const ui::KeyEvent& key_event,
362 scoped_ptr<ui::Event>* rewritten_event) { 385 scoped_ptr<ui::Event>* rewritten_event) {
386 if (IsExtensionCommandRegistered(key_event))
387 return ui::EVENT_REWRITE_CONTINUE;
363 if (key_event.source_device_id() != ui::ED_UNKNOWN_DEVICE) 388 if (key_event.source_device_id() != ui::ED_UNKNOWN_DEVICE)
364 DeviceKeyPressedOrReleased(key_event.source_device_id()); 389 DeviceKeyPressedOrReleased(key_event.source_device_id());
365 MutableKeyState state = {key_event.flags(), key_event.key_code()}; 390 MutableKeyState state = {key_event.flags(), key_event.key_code()};
366 // Do not rewrite an event sent by ui_controls::SendKeyPress(). See 391 // Do not rewrite an event sent by ui_controls::SendKeyPress(). See
367 // crbug.com/136465. 392 // crbug.com/136465.
368 if (!(key_event.flags() & ui::EF_FINAL)) { 393 if (!(key_event.flags() & ui::EF_FINAL)) {
369 RewriteModifierKeys(key_event, &state); 394 RewriteModifierKeys(key_event, &state);
370 RewriteNumPadKeys(key_event, &state); 395 RewriteNumPadKeys(key_event, &state);
371 } 396 }
372 ui::EventRewriteStatus status = ui::EVENT_REWRITE_CONTINUE; 397 ui::EventRewriteStatus status = ui::EVENT_REWRITE_CONTINUE;
(...skipping 488 matching lines...) Expand 10 before | Expand all | Expand 10 after
861 KeyboardDeviceAddedInternal(device_info[i].deviceid, device_info[i].name); 886 KeyboardDeviceAddedInternal(device_info[i].deviceid, device_info[i].name);
862 } 887 }
863 888
864 XIFreeDeviceInfo(device_info); 889 XIFreeDeviceInfo(device_info);
865 #else 890 #else
866 KeyboardDeviceAddedInternal(device_id, "keyboard"); 891 KeyboardDeviceAddedInternal(device_id, "keyboard");
867 #endif 892 #endif
868 } 893 }
869 894
870 } // namespace chromeos 895 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_commands_global_registry.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698