| 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/common/accelerators/accelerator_router.h" |
| 6 | 6 |
| 7 #include "ash/common/accelerators/accelerator_controller.h" | 7 #include "ash/common/accelerators/accelerator_controller.h" |
| 8 #include "ash/common/wm/window_state.h" | 8 #include "ash/common/wm/window_state.h" |
| 9 #include "ash/common/wm_shell.h" | 9 #include "ash/common/wm_shell.h" |
| 10 #include "ash/common/wm_window.h" | 10 #include "ash/common/wm_window.h" |
| 11 #include "ash/shell.h" |
| 11 #include "base/metrics/histogram_macros.h" | 12 #include "base/metrics/histogram_macros.h" |
| 12 #include "base/stl_util.h" | 13 #include "base/stl_util.h" |
| 13 #include "ui/base/accelerators/accelerator.h" | 14 #include "ui/base/accelerators/accelerator.h" |
| 14 #include "ui/events/event.h" | 15 #include "ui/events/event.h" |
| 15 | 16 |
| 16 namespace ash { | 17 namespace ash { |
| 17 | 18 |
| 18 namespace { | 19 namespace { |
| 19 | 20 |
| 20 // Returns true if |key_code| is a key usually handled directly by the shell. | 21 // Returns true if |key_code| is a key usually handled directly by the shell. |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 // send key events to a web content first, then will process keys | 122 // send key events to a web content first, then will process keys |
| 122 // if the web content didn't consume them. | 123 // if the web content didn't consume them. |
| 123 return false; | 124 return false; |
| 124 } | 125 } |
| 125 | 126 |
| 126 // Handle preferred accelerators (such as ALT-TAB) before sending | 127 // Handle preferred accelerators (such as ALT-TAB) before sending |
| 127 // to the target. | 128 // to the target. |
| 128 if (accelerator_controller->IsPreferred(accelerator)) | 129 if (accelerator_controller->IsPreferred(accelerator)) |
| 129 return true; | 130 return true; |
| 130 | 131 |
| 131 return WmShell::Get()->GetAppListTargetVisibility(); | 132 return Shell::Get()->GetAppListTargetVisibility(); |
| 132 } | 133 } |
| 133 | 134 |
| 134 } // namespace ash | 135 } // namespace ash |
| OLD | NEW |