OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 #ifndef ASH_MUS_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_MUS_H_ | 5 #ifndef ASH_MUS_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_MUS_H_ |
6 #define ASH_MUS_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_MUS_H_ | 6 #define ASH_MUS_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_MUS_H_ |
7 | 7 |
8 #include "ash/common/accelerators/accelerator_controller_delegate.h" | 8 #include "ash/common/accelerators/accelerator_controller_delegate.h" |
9 #include "base/macros.h" | 9 #include "base/macros.h" |
10 #include "services/service_manager/public/cpp/connector.h" | 10 #include "services/service_manager/public/cpp/connector.h" |
11 | 11 |
12 namespace ash { | 12 namespace ash { |
13 namespace mus { | 13 namespace mus { |
14 | 14 |
15 class WindowManager; | 15 class WindowManager; |
16 | 16 |
17 class AcceleratorControllerDelegateMus : public AcceleratorControllerDelegate { | 17 class AcceleratorControllerDelegateMus : public AcceleratorControllerDelegate { |
18 public: | 18 public: |
19 explicit AcceleratorControllerDelegateMus(shell::Connector* connector); | 19 explicit AcceleratorControllerDelegateMus( |
| 20 service_manager::Connector* connector); |
20 ~AcceleratorControllerDelegateMus() override; | 21 ~AcceleratorControllerDelegateMus() override; |
21 | 22 |
22 // AcceleratorControllerDelegate: | 23 // AcceleratorControllerDelegate: |
23 bool HandlesAction(AcceleratorAction action) override; | 24 bool HandlesAction(AcceleratorAction action) override; |
24 bool CanPerformAction(AcceleratorAction action, | 25 bool CanPerformAction(AcceleratorAction action, |
25 const ui::Accelerator& accelerator, | 26 const ui::Accelerator& accelerator, |
26 const ui::Accelerator& previous_accelerator) override; | 27 const ui::Accelerator& previous_accelerator) override; |
27 void PerformAction(AcceleratorAction action, | 28 void PerformAction(AcceleratorAction action, |
28 const ui::Accelerator& accelerator) override; | 29 const ui::Accelerator& accelerator) override; |
29 void ShowDeprecatedAcceleratorNotification(const char* const notification_id, | 30 void ShowDeprecatedAcceleratorNotification(const char* const notification_id, |
30 int message_id, | 31 int message_id, |
31 int old_shortcut_id, | 32 int old_shortcut_id, |
32 int new_shortcut_id) override; | 33 int new_shortcut_id) override; |
33 | 34 |
34 private: | 35 private: |
35 shell::Connector* connector_; | 36 service_manager::Connector* connector_; |
36 | 37 |
37 DISALLOW_COPY_AND_ASSIGN(AcceleratorControllerDelegateMus); | 38 DISALLOW_COPY_AND_ASSIGN(AcceleratorControllerDelegateMus); |
38 }; | 39 }; |
39 | 40 |
40 } // namespace mus | 41 } // namespace mus |
41 } // namespace ash | 42 } // namespace ash |
42 | 43 |
43 #endif // ASH_MUS_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_MUS_H_ | 44 #endif // ASH_MUS_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_MUS_H_ |
OLD | NEW |