OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_delegate.h" | 5 #include "ash/accelerators/accelerator_delegate.h" |
6 | 6 |
7 #include "ash/accelerators/accelerator_controller.h" | 7 #include "ash/accelerators/accelerator_controller.h" |
| 8 #include "ash/common/wm/window_state.h" |
8 #include "ash/shell.h" | 9 #include "ash/shell.h" |
9 #include "ash/wm/common/window_state.h" | |
10 #include "ash/wm/window_state_aura.h" | 10 #include "ash/wm/window_state_aura.h" |
11 #include "ui/base/accelerators/accelerator.h" | 11 #include "ui/base/accelerators/accelerator.h" |
12 #include "ui/events/event.h" | 12 #include "ui/events/event.h" |
13 #include "ui/wm/core/window_util.h" | 13 #include "ui/wm/core/window_util.h" |
14 | 14 |
15 namespace ash { | 15 namespace ash { |
16 namespace {} // namespace | 16 namespace {} // namespace |
17 | 17 |
18 AcceleratorDelegate::AcceleratorDelegate() { | 18 AcceleratorDelegate::AcceleratorDelegate() { |
19 } | 19 } |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
83 | 83 |
84 // Handle preferred accelerators (such as ALT-TAB) before sending | 84 // Handle preferred accelerators (such as ALT-TAB) before sending |
85 // to the target. | 85 // to the target. |
86 if (shell->accelerator_controller()->IsPreferred(accelerator)) | 86 if (shell->accelerator_controller()->IsPreferred(accelerator)) |
87 return true; | 87 return true; |
88 | 88 |
89 return shell->GetAppListTargetVisibility(); | 89 return shell->GetAppListTargetVisibility(); |
90 } | 90 } |
91 | 91 |
92 } // namespace ash | 92 } // namespace ash |
OLD | NEW |