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

Side by Side Diff: chrome/browser/chromeos/input_method/input_method_engine.cc

Issue 1559163002: Clean up event flags a bit: (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Review comment Created 4 years, 11 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/input_method/input_method_engine.h" 5 #include "chrome/browser/chromeos/input_method/input_method_engine.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #undef FocusIn 9 #undef FocusIn
10 #undef FocusOut 10 #undef FocusOut
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 ext_event->type = (event.type() == ui::ET_KEY_RELEASED) ? "keyup" : "keydown"; 143 ext_event->type = (event.type() == ui::ET_KEY_RELEASED) ? "keyup" : "keydown";
144 144
145 if (event.code() == ui::DomCode::NONE) 145 if (event.code() == ui::DomCode::NONE)
146 ext_event->code = ui::KeyboardCodeToDomKeycode(event.key_code()); 146 ext_event->code = ui::KeyboardCodeToDomKeycode(event.key_code());
147 else 147 else
148 ext_event->code = event.GetCodeString(); 148 ext_event->code = event.GetCodeString();
149 ext_event->key_code = static_cast<int>(event.key_code()); 149 ext_event->key_code = static_cast<int>(event.key_code());
150 ext_event->alt_key = event.IsAltDown(); 150 ext_event->alt_key = event.IsAltDown();
151 ext_event->ctrl_key = event.IsControlDown(); 151 ext_event->ctrl_key = event.IsControlDown();
152 ext_event->shift_key = event.IsShiftDown(); 152 ext_event->shift_key = event.IsShiftDown();
153 ext_event->caps_lock = event.IsCapsLockDown(); 153 ext_event->caps_lock = event.IsCapsLockOn();
154 ext_event->key = GetKeyFromEvent(event); 154 ext_event->key = GetKeyFromEvent(event);
155 } 155 }
156 156
157 } // namespace 157 } // namespace
158 158
159 InputMethodEngine::InputMethodEngine() 159 InputMethodEngine::InputMethodEngine()
160 : current_input_type_(ui::TEXT_INPUT_TYPE_NONE), 160 : current_input_type_(ui::TEXT_INPUT_TYPE_NONE),
161 context_id_(0), 161 context_id_(0),
162 next_context_id_(1), 162 next_context_id_(1),
163 composition_text_(new ui::CompositionText()), 163 composition_text_(new ui::CompositionText()),
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 const ui::EventType type = 299 const ui::EventType type =
300 (event.type == "keyup") ? ui::ET_KEY_RELEASED : ui::ET_KEY_PRESSED; 300 (event.type == "keyup") ? ui::ET_KEY_RELEASED : ui::ET_KEY_PRESSED;
301 ui::KeyboardCode key_code = static_cast<ui::KeyboardCode>(event.key_code); 301 ui::KeyboardCode key_code = static_cast<ui::KeyboardCode>(event.key_code);
302 if (key_code == ui::VKEY_UNKNOWN) 302 if (key_code == ui::VKEY_UNKNOWN)
303 key_code = ui::DomKeycodeToKeyboardCode(event.code); 303 key_code = ui::DomKeycodeToKeyboardCode(event.code);
304 304
305 int flags = ui::EF_NONE; 305 int flags = ui::EF_NONE;
306 flags |= event.alt_key ? ui::EF_ALT_DOWN : ui::EF_NONE; 306 flags |= event.alt_key ? ui::EF_ALT_DOWN : ui::EF_NONE;
307 flags |= event.ctrl_key ? ui::EF_CONTROL_DOWN : ui::EF_NONE; 307 flags |= event.ctrl_key ? ui::EF_CONTROL_DOWN : ui::EF_NONE;
308 flags |= event.shift_key ? ui::EF_SHIFT_DOWN : ui::EF_NONE; 308 flags |= event.shift_key ? ui::EF_SHIFT_DOWN : ui::EF_NONE;
309 flags |= event.caps_lock ? ui::EF_CAPS_LOCK_DOWN : ui::EF_NONE; 309 flags |= event.caps_lock ? ui::EF_CAPS_LOCK_ON : ui::EF_NONE;
310 310
311 ui::KeyEvent ui_event( 311 ui::KeyEvent ui_event(
312 type, key_code, 312 type, key_code,
313 ui::KeycodeConverter::CodeStringToDomCode(event.code), flags, 313 ui::KeycodeConverter::CodeStringToDomCode(event.code), flags,
314 ui::KeycodeConverter::KeyStringToDomKey(event.key), 314 ui::KeycodeConverter::KeyStringToDomKey(event.key),
315 ui::EventTimeForNow()); 315 ui::EventTimeForNow());
316 base::AutoReset<const ui::KeyEvent*> reset_sent_key(&sent_key_event_, 316 base::AutoReset<const ui::KeyEvent*> reset_sent_key(&sent_key_event_,
317 &ui_event); 317 &ui_event);
318 ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&ui_event); 318 ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&ui_event);
319 if (details.dispatcher_destroyed) 319 if (details.dispatcher_destroyed)
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after
665 // TODO(nona): Implement it. 665 // TODO(nona): Implement it.
666 break; 666 break;
667 } 667 }
668 } 668 }
669 } 669 }
670 670
671 // TODO(nona): Support item.children. 671 // TODO(nona): Support item.children.
672 } 672 }
673 673
674 } // namespace chromeos 674 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698