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

Side by Side Diff: ui/aura/event.cc

Issue 8576005: IME (input method editor) support for Aura, part 3 of 3: Use ui::InputMethod in ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, review Created 9 years 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/aura/event.h" 5 #include "ui/aura/event.h"
6 6
7 #if defined(USE_X11) 7 #if defined(USE_X11)
8 #include <X11/Xlib.h> 8 #include <X11/Xlib.h>
9 #endif 9 #endif
10 10
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 key->state &= ~kIgnoredModifiers; 244 key->state &= ~kIgnoredModifiers;
245 uint16 ch = ui::GetCharacterFromXEvent(native_event()); 245 uint16 ch = ui::GetCharacterFromXEvent(native_event());
246 return ch ? ch : 246 return ch ? ch :
247 ui::GetCharacterFromKeyCode(key_code_, flags() & ui::EF_SHIFT_DOWN); 247 ui::GetCharacterFromKeyCode(key_code_, flags() & ui::EF_SHIFT_DOWN);
248 #else 248 #else
249 NOTIMPLEMENTED(); 249 NOTIMPLEMENTED();
250 return 0; 250 return 0;
251 #endif 251 #endif
252 } 252 }
253 253
254 TranslatedKeyEvent::TranslatedKeyEvent(const base::NativeEvent& native_event,
255 bool is_char)
256 : KeyEvent(native_event, is_char) {
257 }
258
259 TranslatedKeyEvent::TranslatedKeyEvent(ui::EventType type,
260 ui::KeyboardCode key_code,
261 int flags)
262 : KeyEvent(type, key_code, flags) {
263 }
264
254 } // namespace aura 265 } // namespace aura
OLDNEW
« ui/aura/event.h ('K') | « ui/aura/event.h ('k') | ui/aura/event_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698