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

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

Issue 336403005: Use XInput2 events for keyboard events. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address review comments (sadrul) 3 Created 6 years, 5 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/keyboard_driven_event_rewriter.h" 5 #include "chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h"
6 6
7 #include "chrome/browser/chromeos/events/event_rewriter.h"
7 #include "chrome/browser/chromeos/login/users/user_manager.h" 8 #include "chrome/browser/chromeos/login/users/user_manager.h"
8 #include "chrome/browser/chromeos/system/input_device_settings.h" 9 #include "chrome/browser/chromeos/system/input_device_settings.h"
9 #include "ui/events/event.h" 10 #include "ui/events/event.h"
10 #include "ui/events/event_utils.h" 11 #include "ui/events/event_utils.h"
11 12
12 namespace chromeos { 13 namespace chromeos {
13 14
14 namespace { 15 namespace {
15 16
16 const int kModifierMask = ui::EF_SHIFT_DOWN; 17 const int kModifierMask = ui::EF_SHIFT_DOWN;
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 71
71 if (key_code != ui::VKEY_LEFT && 72 if (key_code != ui::VKEY_LEFT &&
72 key_code != ui::VKEY_RIGHT && 73 key_code != ui::VKEY_RIGHT &&
73 key_code != ui::VKEY_UP && 74 key_code != ui::VKEY_UP &&
74 key_code != ui::VKEY_DOWN && 75 key_code != ui::VKEY_DOWN &&
75 key_code != ui::VKEY_RETURN && 76 key_code != ui::VKEY_RETURN &&
76 key_code != ui::VKEY_F6) { 77 key_code != ui::VKEY_F6) {
77 return ui::EVENT_REWRITE_CONTINUE; 78 return ui::EVENT_REWRITE_CONTINUE;
78 } 79 }
79 80
80 rewritten_event->reset(new ui::KeyEvent(key_event)); 81 chromeos::EventRewriter::BuildRewrittenKeyEvent(
81 (*rewritten_event)->set_flags( 82 key_event,
82 flags & ~(ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN)); 83 key_event.key_code(),
84 flags & ~(ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN),
85 rewritten_event);
83 return ui::EVENT_REWRITE_REWRITTEN; 86 return ui::EVENT_REWRITE_REWRITTEN;
84 } 87 }
85 88
86 } // namespace chromeos 89 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/events/event_rewriter_unittest.cc ('k') | ui/aura/gestures/gesture_recognizer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698