| 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/common/accelerators/accelerator_router.h" | 5 #include "ash/accelerators/accelerator_router.h" |
| 6 | 6 |
| 7 #include "ash/common/accelerators/accelerator_controller.h" | 7 #include "ash/accelerators/accelerator_controller.h" |
| 8 #include "ash/common/wm/window_state.h" | 8 #include "ash/wm/window_state.h" |
| 9 #include "ash/common/wm_shell.h" | 9 #include "ash/wm_shell.h" |
| 10 #include "ash/common/wm_window.h" | 10 #include "ash/wm_window.h" |
| 11 #include "base/metrics/histogram_macros.h" | 11 #include "base/metrics/histogram_macros.h" |
| 12 #include "base/stl_util.h" | 12 #include "base/stl_util.h" |
| 13 #include "ui/base/accelerators/accelerator.h" | 13 #include "ui/base/accelerators/accelerator.h" |
| 14 #include "ui/events/event.h" | 14 #include "ui/events/event.h" |
| 15 | 15 |
| 16 namespace ash { | 16 namespace ash { |
| 17 | 17 |
| 18 namespace { | 18 namespace { |
| 19 | 19 |
| 20 // Returns true if |key_code| is a key usually handled directly by the shell. | 20 // Returns true if |key_code| is a key usually handled directly by the shell. |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 | 125 |
| 126 // Handle preferred accelerators (such as ALT-TAB) before sending | 126 // Handle preferred accelerators (such as ALT-TAB) before sending |
| 127 // to the target. | 127 // to the target. |
| 128 if (accelerator_controller->IsPreferred(accelerator)) | 128 if (accelerator_controller->IsPreferred(accelerator)) |
| 129 return true; | 129 return true; |
| 130 | 130 |
| 131 return WmShell::Get()->GetAppListTargetVisibility(); | 131 return WmShell::Get()->GetAppListTargetVisibility(); |
| 132 } | 132 } |
| 133 | 133 |
| 134 } // namespace ash | 134 } // namespace ash |
| OLD | NEW |