Chromium Code Reviews| 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/shell/public/cpp/connector.h" | |
| 10 | 11 |
| 11 namespace ash { | 12 namespace ash { |
| 12 namespace mus { | 13 namespace mus { |
| 13 | 14 |
| 14 class WindowManager; | 15 class WindowManager; |
| 15 | 16 |
| 16 class AcceleratorControllerDelegateMus : public AcceleratorControllerDelegate { | 17 class AcceleratorControllerDelegateMus : public AcceleratorControllerDelegate { |
| 17 public: | 18 public: |
| 18 AcceleratorControllerDelegateMus(); | 19 AcceleratorControllerDelegateMus(shell::Connector* connector); |
|
sky
2016/09/01 22:09:36
explicit
riajiang
2016/09/02 18:18:38
Done.
| |
| 19 ~AcceleratorControllerDelegateMus() override; | 20 ~AcceleratorControllerDelegateMus() override; |
| 20 | 21 |
| 21 // AcceleratorControllerDelegate: | 22 // AcceleratorControllerDelegate: |
| 22 bool HandlesAction(AcceleratorAction action) override; | 23 bool HandlesAction(AcceleratorAction action) override; |
| 23 bool CanPerformAction(AcceleratorAction action, | 24 bool CanPerformAction(AcceleratorAction action, |
| 24 const ui::Accelerator& accelerator, | 25 const ui::Accelerator& accelerator, |
| 25 const ui::Accelerator& previous_accelerator) override; | 26 const ui::Accelerator& previous_accelerator) override; |
| 26 void PerformAction(AcceleratorAction action, | 27 void PerformAction(AcceleratorAction action, |
| 27 const ui::Accelerator& accelerator) override; | 28 const ui::Accelerator& accelerator) override; |
| 28 void ShowDeprecatedAcceleratorNotification(const char* const notification_id, | 29 void ShowDeprecatedAcceleratorNotification(const char* const notification_id, |
| 29 int message_id, | 30 int message_id, |
| 30 int old_shortcut_id, | 31 int old_shortcut_id, |
| 31 int new_shortcut_id) override; | 32 int new_shortcut_id) override; |
| 32 | 33 |
| 33 private: | 34 private: |
| 35 shell::Connector* connector_; | |
| 36 | |
| 34 DISALLOW_COPY_AND_ASSIGN(AcceleratorControllerDelegateMus); | 37 DISALLOW_COPY_AND_ASSIGN(AcceleratorControllerDelegateMus); |
| 35 }; | 38 }; |
| 36 | 39 |
| 37 } // namespace mus | 40 } // namespace mus |
| 38 } // namespace ash | 41 } // namespace ash |
| 39 | 42 |
| 40 #endif // ASH_MUS_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_MUS_H_ | 43 #endif // ASH_MUS_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_MUS_H_ |
| OLD | NEW |