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 "ash/accelerators/accelerator_filter.h" | 5 #include "ash/accelerators/accelerator_filter.h" |
6 | 6 |
7 #include "ash/accelerators/accelerator_controller.h" | 7 #include "ash/accelerators/accelerator_controller.h" |
8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
9 #include "ash/wm/window_util.h" | 9 #include "ash/wm/window_util.h" |
10 #include "ui/aura/root_window.h" | 10 #include "ui/aura/root_window.h" |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
82 if (!ShouldProcessAcceleratorsNow(accelerator, target)) | 82 if (!ShouldProcessAcceleratorsNow(accelerator, target)) |
83 return false; | 83 return false; |
84 return Shell::GetInstance()->accelerator_controller()->Process(accelerator); | 84 return Shell::GetInstance()->accelerator_controller()->Process(accelerator); |
85 } | 85 } |
86 | 86 |
87 bool AcceleratorFilter::PreHandleMouseEvent(aura::Window* target, | 87 bool AcceleratorFilter::PreHandleMouseEvent(aura::Window* target, |
88 ui::MouseEvent* event) { | 88 ui::MouseEvent* event) { |
89 return false; | 89 return false; |
90 } | 90 } |
91 | 91 |
92 ui::TouchStatus AcceleratorFilter::PreHandleTouchEvent( | 92 ui::EventResult AcceleratorFilter::PreHandleTouchEvent( |
93 aura::Window* target, | 93 aura::Window* target, |
94 ui::TouchEvent* event) { | 94 ui::TouchEvent* event) { |
95 return ui::TOUCH_STATUS_UNKNOWN; | 95 return ui::ER_UNHANDLED; |
96 } | 96 } |
97 | 97 |
98 ui::EventResult AcceleratorFilter::PreHandleGestureEvent( | 98 ui::EventResult AcceleratorFilter::PreHandleGestureEvent( |
99 aura::Window* target, | 99 aura::Window* target, |
100 ui::GestureEvent* event) { | 100 ui::GestureEvent* event) { |
101 return ui::ER_UNHANDLED; | 101 return ui::ER_UNHANDLED; |
102 } | 102 } |
103 | 103 |
104 } // namespace internal | 104 } // namespace internal |
105 } // namespace ash | 105 } // namespace ash |
OLD | NEW |