| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/shared/input_method_event_filter.h" | 5 #include "ui/aura/shared/input_method_event_filter.h" |
| 6 | 6 |
| 7 #include "ui/aura/client/aura_constants.h" | 7 #include "ui/aura/client/aura_constants.h" |
| 8 #include "ui/aura/root_window.h" | 8 #include "ui/aura/root_window.h" |
| 9 #include "ui/base/events/event.h" | 9 #include "ui/base/events/event.h" |
| 10 #include "ui/base/ime/input_method.h" | 10 #include "ui/base/ime/input_method.h" |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 input_method_->DispatchFabricatedKeyEvent(*event); | 57 input_method_->DispatchFabricatedKeyEvent(*event); |
| 58 return true; | 58 return true; |
| 59 } | 59 } |
| 60 } | 60 } |
| 61 | 61 |
| 62 bool InputMethodEventFilter::PreHandleMouseEvent(aura::Window* target, | 62 bool InputMethodEventFilter::PreHandleMouseEvent(aura::Window* target, |
| 63 ui::MouseEvent* event) { | 63 ui::MouseEvent* event) { |
| 64 return false; | 64 return false; |
| 65 } | 65 } |
| 66 | 66 |
| 67 ui::TouchStatus InputMethodEventFilter::PreHandleTouchEvent( | 67 ui::EventResult InputMethodEventFilter::PreHandleTouchEvent( |
| 68 aura::Window* target, | 68 aura::Window* target, |
| 69 ui::TouchEvent* event) { | 69 ui::TouchEvent* event) { |
| 70 return ui::TOUCH_STATUS_UNKNOWN; | 70 return ui::ER_UNHANDLED; |
| 71 } | 71 } |
| 72 | 72 |
| 73 ui::EventResult InputMethodEventFilter::PreHandleGestureEvent( | 73 ui::EventResult InputMethodEventFilter::PreHandleGestureEvent( |
| 74 aura::Window* target, | 74 aura::Window* target, |
| 75 ui::GestureEvent* event) { | 75 ui::GestureEvent* event) { |
| 76 return ui::ER_UNHANDLED; | 76 return ui::ER_UNHANDLED; |
| 77 } | 77 } |
| 78 | 78 |
| 79 //////////////////////////////////////////////////////////////////////////////// | 79 //////////////////////////////////////////////////////////////////////////////// |
| 80 // InputMethodEventFilter, ui::InputMethodDelegate implementation: | 80 // InputMethodEventFilter, ui::InputMethodDelegate implementation: |
| (...skipping 11 matching lines...) Expand all Loading... |
| 92 ui::EventType type, | 92 ui::EventType type, |
| 93 ui::KeyboardCode key_code, | 93 ui::KeyboardCode key_code, |
| 94 int flags) { | 94 int flags) { |
| 95 ui::TranslatedKeyEvent aura_event(type == ui::ET_KEY_PRESSED, key_code, | 95 ui::TranslatedKeyEvent aura_event(type == ui::ET_KEY_PRESSED, key_code, |
| 96 flags); | 96 flags); |
| 97 target_root_window_->AsRootWindowHostDelegate()->OnHostKeyEvent(&aura_event); | 97 target_root_window_->AsRootWindowHostDelegate()->OnHostKeyEvent(&aura_event); |
| 98 } | 98 } |
| 99 | 99 |
| 100 } // namespace shared | 100 } // namespace shared |
| 101 } // namespace aura | 101 } // namespace aura |
| OLD | NEW |