Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(20)

Side by Side Diff: ash/mus/accelerators/accelerator_controller_delegate_mus.h

Issue 2434923002: Handle modified displays in mustash. (Closed)
Patch Set: Fix PlatformScreenStub for tests. Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | ash/mus/accelerators/accelerator_controller_delegate_mus.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
11 10
12 namespace ash { 11 namespace ash {
13 namespace mus { 12 namespace mus {
14 13
15 class WindowManager; 14 class WindowManager;
16 15
17 class AcceleratorControllerDelegateMus : public AcceleratorControllerDelegate { 16 class AcceleratorControllerDelegateMus : public AcceleratorControllerDelegate {
18 public: 17 public:
19 explicit AcceleratorControllerDelegateMus( 18 explicit AcceleratorControllerDelegateMus(WindowManager* window_manager);
20 service_manager::Connector* connector);
21 ~AcceleratorControllerDelegateMus() override; 19 ~AcceleratorControllerDelegateMus() override;
22 20
23 // AcceleratorControllerDelegate: 21 // AcceleratorControllerDelegate:
24 bool HandlesAction(AcceleratorAction action) override; 22 bool HandlesAction(AcceleratorAction action) override;
25 bool CanPerformAction(AcceleratorAction action, 23 bool CanPerformAction(AcceleratorAction action,
26 const ui::Accelerator& accelerator, 24 const ui::Accelerator& accelerator,
27 const ui::Accelerator& previous_accelerator) override; 25 const ui::Accelerator& previous_accelerator) override;
28 void PerformAction(AcceleratorAction action, 26 void PerformAction(AcceleratorAction action,
29 const ui::Accelerator& accelerator) override; 27 const ui::Accelerator& accelerator) override;
30 void ShowDeprecatedAcceleratorNotification(const char* const notification_id, 28 void ShowDeprecatedAcceleratorNotification(const char* const notification_id,
31 int message_id, 29 int message_id,
32 int old_shortcut_id, 30 int old_shortcut_id,
33 int new_shortcut_id) override; 31 int new_shortcut_id) override;
34 32
35 private: 33 private:
36 service_manager::Connector* connector_; 34 WindowManager* window_manager_;
37 35
38 DISALLOW_COPY_AND_ASSIGN(AcceleratorControllerDelegateMus); 36 DISALLOW_COPY_AND_ASSIGN(AcceleratorControllerDelegateMus);
39 }; 37 };
40 38
41 } // namespace mus 39 } // namespace mus
42 } // namespace ash 40 } // namespace ash
43 41
44 #endif // ASH_MUS_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_MUS_H_ 42 #endif // ASH_MUS_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_MUS_H_
OLDNEW
« no previous file with comments | « no previous file | ash/mus/accelerators/accelerator_controller_delegate_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698