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

Side by Side Diff: ash/mus/bridge/wm_shell_mus.h

Issue 2752593008: Move AcceleratorController from WmShell to Shell (Closed)
Patch Set: cleanup Created 3 years, 9 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
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_BRIDGE_WM_SHELL_MUS_H_ 5 #ifndef ASH_MUS_BRIDGE_WM_SHELL_MUS_H_
6 #define ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ 6 #define ASH_MUS_BRIDGE_WM_SHELL_MUS_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 void AddPointerWatcher(views::PointerWatcher* watcher, 101 void AddPointerWatcher(views::PointerWatcher* watcher,
102 views::PointerWatcherEventTypes events) override; 102 views::PointerWatcherEventTypes events) override;
103 void RemovePointerWatcher(views::PointerWatcher* watcher) override; 103 void RemovePointerWatcher(views::PointerWatcher* watcher) override;
104 bool IsTouchDown() override; 104 bool IsTouchDown() override;
105 void ToggleIgnoreExternalKeyboard() override; 105 void ToggleIgnoreExternalKeyboard() override;
106 void SetLaserPointerEnabled(bool enabled) override; 106 void SetLaserPointerEnabled(bool enabled) override;
107 void SetPartialMagnifierEnabled(bool enabled) override; 107 void SetPartialMagnifierEnabled(bool enabled) override;
108 void CreatePointerWatcherAdapter() override; 108 void CreatePointerWatcherAdapter() override;
109 void CreatePrimaryHost() override; 109 void CreatePrimaryHost() override;
110 void InitHosts(const ShellInitParams& init_params) override; 110 void InitHosts(const ShellInitParams& init_params) override;
111 std::unique_ptr<AcceleratorController> CreateAcceleratorController() override;
111 112
112 private: 113 private:
113 friend class WmShellMusTestApi; 114 friend class WmShellMusTestApi;
114 115
115 WindowManager* window_manager_; 116 WindowManager* window_manager_;
116 117
117 WmWindow* primary_root_window_; 118 WmWindow* primary_root_window_;
118 views::PointerWatcherEventRouter* pointer_watcher_event_router_; 119 views::PointerWatcherEventRouter* pointer_watcher_event_router_;
119 120
120 std::unique_ptr<AcceleratorControllerDelegateMus> 121 std::unique_ptr<AcceleratorControllerDelegateMus>
121 accelerator_controller_delegate_; 122 accelerator_controller_delegate_;
122 std::unique_ptr<AcceleratorControllerRegistrar> 123 std::unique_ptr<AcceleratorControllerRegistrar>
123 accelerator_controller_registrar_; 124 accelerator_controller_registrar_;
124 std::unique_ptr<ImmersiveHandlerFactoryMus> immersive_handler_factory_; 125 std::unique_ptr<ImmersiveHandlerFactoryMus> immersive_handler_factory_;
125 std::unique_ptr<SessionStateDelegate> session_state_delegate_; 126 std::unique_ptr<SessionStateDelegate> session_state_delegate_;
126 127
127 DISALLOW_COPY_AND_ASSIGN(WmShellMus); 128 DISALLOW_COPY_AND_ASSIGN(WmShellMus);
128 }; 129 };
129 130
130 } // namespace mus 131 } // namespace mus
131 } // namespace ash 132 } // namespace ash
132 133
133 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ 134 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698