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

Side by Side Diff: ui/events/keycodes/dom/keycode_converter.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 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 "ui/events/keycodes/dom/keycode_converter.h" 5 #include "ui/events/keycodes/dom/keycode_converter.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/strings/utf_string_conversion_utils.h" 9 #include "base/strings/utf_string_conversion_utils.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 } 118 }
119 119
120 // static 120 // static
121 DomKeyLocation KeycodeConverter::DomCodeToLocation(DomCode dom_code) { 121 DomKeyLocation KeycodeConverter::DomCodeToLocation(DomCode dom_code) {
122 static const struct { 122 static const struct {
123 DomCode code; 123 DomCode code;
124 DomKeyLocation location; 124 DomKeyLocation location;
125 } kLocations[] = {{DomCode::CONTROL_LEFT, DomKeyLocation::LEFT}, 125 } kLocations[] = {{DomCode::CONTROL_LEFT, DomKeyLocation::LEFT},
126 {DomCode::SHIFT_LEFT, DomKeyLocation::LEFT}, 126 {DomCode::SHIFT_LEFT, DomKeyLocation::LEFT},
127 {DomCode::ALT_LEFT, DomKeyLocation::LEFT}, 127 {DomCode::ALT_LEFT, DomKeyLocation::LEFT},
128 {DomCode::OS_LEFT, DomKeyLocation::LEFT}, 128 {DomCode::META_LEFT, DomKeyLocation::LEFT},
129 {DomCode::CONTROL_RIGHT, DomKeyLocation::RIGHT}, 129 {DomCode::CONTROL_RIGHT, DomKeyLocation::RIGHT},
130 {DomCode::SHIFT_RIGHT, DomKeyLocation::RIGHT}, 130 {DomCode::SHIFT_RIGHT, DomKeyLocation::RIGHT},
131 {DomCode::ALT_RIGHT, DomKeyLocation::RIGHT}, 131 {DomCode::ALT_RIGHT, DomKeyLocation::RIGHT},
132 {DomCode::OS_RIGHT, DomKeyLocation::RIGHT}, 132 {DomCode::META_RIGHT, DomKeyLocation::RIGHT},
133 {DomCode::NUMPAD_DIVIDE, DomKeyLocation::NUMPAD}, 133 {DomCode::NUMPAD_DIVIDE, DomKeyLocation::NUMPAD},
134 {DomCode::NUMPAD_MULTIPLY, DomKeyLocation::NUMPAD}, 134 {DomCode::NUMPAD_MULTIPLY, DomKeyLocation::NUMPAD},
135 {DomCode::NUMPAD_SUBTRACT, DomKeyLocation::NUMPAD}, 135 {DomCode::NUMPAD_SUBTRACT, DomKeyLocation::NUMPAD},
136 {DomCode::NUMPAD_ADD, DomKeyLocation::NUMPAD}, 136 {DomCode::NUMPAD_ADD, DomKeyLocation::NUMPAD},
137 {DomCode::NUMPAD_ENTER, DomKeyLocation::NUMPAD}, 137 {DomCode::NUMPAD_ENTER, DomKeyLocation::NUMPAD},
138 {DomCode::NUMPAD1, DomKeyLocation::NUMPAD}, 138 {DomCode::NUMPAD1, DomKeyLocation::NUMPAD},
139 {DomCode::NUMPAD2, DomKeyLocation::NUMPAD}, 139 {DomCode::NUMPAD2, DomKeyLocation::NUMPAD},
140 {DomCode::NUMPAD3, DomKeyLocation::NUMPAD}, 140 {DomCode::NUMPAD3, DomKeyLocation::NUMPAD},
141 {DomCode::NUMPAD4, DomKeyLocation::NUMPAD}, 141 {DomCode::NUMPAD4, DomKeyLocation::NUMPAD},
142 {DomCode::NUMPAD5, DomKeyLocation::NUMPAD}, 142 {DomCode::NUMPAD5, DomKeyLocation::NUMPAD},
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 303
304 for (size_t i = 0; i < kKeycodeMapEntries; ++i) { 304 for (size_t i = 0; i < kKeycodeMapEntries; ++i) {
305 if (usb_keycode_map[i].code && code == usb_keycode_map[i].code) { 305 if (usb_keycode_map[i].code && code == usb_keycode_map[i].code) {
306 return usb_keycode_map[i].usb_keycode; 306 return usb_keycode_map[i].usb_keycode;
307 } 307 }
308 } 308 }
309 return InvalidUsbKeycode(); 309 return InvalidUsbKeycode();
310 } 310 }
311 311
312 } // namespace ui 312 } // namespace ui
OLDNEW
« no previous file with comments | « remoting/protocol/input_event_tracker.cc ('k') | ui/events/keycodes/dom/keycode_converter_data.inc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698