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

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

Issue 2724913002: Move chromeos::EventRewriter to //ui/chromeos/events (Closed)
Patch Set: Fix a typo Created 3 years, 9 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"
8 #include "chrome/browser/chromeos/system/input_device_settings.h" 7 #include "chrome/browser/chromeos/system/input_device_settings.h"
9 #include "components/session_manager/core/session_manager.h" 8 #include "components/session_manager/core/session_manager.h"
9 #include "ui/chromeos/events/event_rewriter_chromeos.h"
10 #include "ui/events/event.h" 10 #include "ui/events/event.h"
11 #include "ui/events/event_utils.h" 11 #include "ui/events/event_utils.h"
12 12
13 namespace chromeos { 13 namespace chromeos {
14 14
15 namespace { 15 namespace {
16 16
17 const int kModifierMask = ui::EF_SHIFT_DOWN; 17 const int kModifierMask = ui::EF_SHIFT_DOWN;
18 18
19 KeyboardDrivenEventRewriter* instance = nullptr; 19 KeyboardDrivenEventRewriter* instance = nullptr;
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 << "Unexpected event type " << event.type(); 82 << "Unexpected event type " << event.type();
83 const ui::KeyEvent& key_event = static_cast<const ui::KeyEvent&>(event); 83 const ui::KeyEvent& key_event = static_cast<const ui::KeyEvent&>(event);
84 ui::KeyboardCode key_code = key_event.key_code(); 84 ui::KeyboardCode key_code = key_event.key_code();
85 85
86 if (key_code != ui::VKEY_LEFT && key_code != ui::VKEY_RIGHT && 86 if (key_code != ui::VKEY_LEFT && key_code != ui::VKEY_RIGHT &&
87 key_code != ui::VKEY_UP && key_code != ui::VKEY_DOWN && 87 key_code != ui::VKEY_UP && key_code != ui::VKEY_DOWN &&
88 key_code != ui::VKEY_RETURN && key_code != ui::VKEY_F6) { 88 key_code != ui::VKEY_RETURN && key_code != ui::VKEY_F6) {
89 return ui::EVENT_REWRITE_CONTINUE; 89 return ui::EVENT_REWRITE_CONTINUE;
90 } 90 }
91 91
92 chromeos::EventRewriter::MutableKeyState state = { 92 ui::EventRewriterChromeOS::MutableKeyState state = {
93 flags & ~(ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN), 93 flags & ~(ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN),
94 key_event.code(), 94 key_event.code(), key_event.GetDomKey(), key_event.key_code()};
95 key_event.GetDomKey(),
96 key_event.key_code()};
97 95
98 if (rewritten_to_tab_) { 96 if (rewritten_to_tab_) {
99 if (key_code == ui::VKEY_LEFT || key_code == ui::VKEY_RIGHT || 97 if (key_code == ui::VKEY_LEFT || key_code == ui::VKEY_RIGHT ||
100 key_code == ui::VKEY_UP || key_code == ui::VKEY_DOWN) { 98 key_code == ui::VKEY_UP || key_code == ui::VKEY_DOWN) {
101 const ui::KeyEvent tab_event(ui::ET_KEY_PRESSED, ui::VKEY_TAB, 99 const ui::KeyEvent tab_event(ui::ET_KEY_PRESSED, ui::VKEY_TAB,
102 ui::EF_NONE); 100 ui::EF_NONE);
103 state.code = tab_event.code(); 101 state.code = tab_event.code();
104 state.key = tab_event.GetDomKey(); 102 state.key = tab_event.GetDomKey();
105 state.key_code = tab_event.key_code(); 103 state.key_code = tab_event.key_code();
106 if (key_code == ui::VKEY_LEFT || key_code == ui::VKEY_UP) 104 if (key_code == ui::VKEY_LEFT || key_code == ui::VKEY_UP)
107 state.flags |= ui::EF_SHIFT_DOWN; 105 state.flags |= ui::EF_SHIFT_DOWN;
108 } 106 }
109 } 107 }
110 108
111 chromeos::EventRewriter::BuildRewrittenKeyEvent(key_event, state, 109 ui::EventRewriterChromeOS::BuildRewrittenKeyEvent(key_event, state,
112 rewritten_event); 110 rewritten_event);
113 return ui::EVENT_REWRITE_REWRITTEN; 111 return ui::EVENT_REWRITE_REWRITTEN;
114 } 112 }
115 113
116 } // namespace chromeos 114 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/events/event_rewriter_unittest.cc ('k') | chrome/browser/chromeos/preferences.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698