OLD | NEW |
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 "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 "ui/aura/event.h" | 9 #include "ui/aura/event.h" |
10 #include "ui/aura/root_window.h" | 10 #include "ui/aura/root_window.h" |
11 #include "ui/base/accelerators/accelerator.h" | 11 #include "ui/base/accelerators/accelerator.h" |
12 #include "ui/base/accelerators/accelerator_manager.h" | 12 #include "ui/base/accelerators/accelerator_manager.h" |
13 | 13 |
14 namespace { | 14 namespace { |
15 const int kModifierFlagMask = (ui::EF_SHIFT_DOWN | | 15 const int kModifierFlagMask = (ui::EF_SHIFT_DOWN | |
16 ui::EF_CONTROL_DOWN | | 16 ui::EF_CONTROL_DOWN | |
17 ui::EF_ALT_DOWN); | 17 ui::EF_ALT_DOWN); |
18 } // namespace | 18 } // namespace |
19 | 19 |
20 namespace aura_shell { | 20 namespace ash { |
21 namespace internal { | 21 namespace internal { |
22 | 22 |
23 //////////////////////////////////////////////////////////////////////////////// | 23 //////////////////////////////////////////////////////////////////////////////// |
24 // AcceleratorFilter, public: | 24 // AcceleratorFilter, public: |
25 | 25 |
26 AcceleratorFilter::AcceleratorFilter() | 26 AcceleratorFilter::AcceleratorFilter() |
27 : EventFilter(aura::RootWindow::GetInstance()) { | 27 : EventFilter(aura::RootWindow::GetInstance()) { |
28 } | 28 } |
29 | 29 |
30 AcceleratorFilter::~AcceleratorFilter() { | 30 AcceleratorFilter::~AcceleratorFilter() { |
(...skipping 17 matching lines...) Expand all Loading... |
48 return false; | 48 return false; |
49 } | 49 } |
50 | 50 |
51 ui::TouchStatus AcceleratorFilter::PreHandleTouchEvent( | 51 ui::TouchStatus AcceleratorFilter::PreHandleTouchEvent( |
52 aura::Window* target, | 52 aura::Window* target, |
53 aura::TouchEvent* event) { | 53 aura::TouchEvent* event) { |
54 return ui::TOUCH_STATUS_UNKNOWN; | 54 return ui::TOUCH_STATUS_UNKNOWN; |
55 } | 55 } |
56 | 56 |
57 } // namespace internal | 57 } // namespace internal |
58 } // namespace aura_shell | 58 } // namespace ash |
OLD | NEW |