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

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

Issue 2761063002: Move more from WmShell to Shell (Closed)
Patch Set: merge 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
« no previous file with comments | « ash/metrics/user_metrics_recorder.cc ('k') | ash/mus/bridge/wm_shell_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_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 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 std::unique_ptr<WindowCycleEventFilter> CreateWindowCycleEventFilter() 87 std::unique_ptr<WindowCycleEventFilter> CreateWindowCycleEventFilter()
88 override; 88 override;
89 std::unique_ptr<wm::MaximizeModeEventHandler> CreateMaximizeModeEventHandler() 89 std::unique_ptr<wm::MaximizeModeEventHandler> CreateMaximizeModeEventHandler()
90 override; 90 override;
91 std::unique_ptr<WorkspaceEventHandler> CreateWorkspaceEventHandler( 91 std::unique_ptr<WorkspaceEventHandler> CreateWorkspaceEventHandler(
92 WmWindow* workspace_window) override; 92 WmWindow* workspace_window) override;
93 std::unique_ptr<ScopedDisableInternalMouseAndKeyboard> 93 std::unique_ptr<ScopedDisableInternalMouseAndKeyboard>
94 CreateScopedDisableInternalMouseAndKeyboard() override; 94 CreateScopedDisableInternalMouseAndKeyboard() override;
95 std::unique_ptr<ImmersiveFullscreenController> 95 std::unique_ptr<ImmersiveFullscreenController>
96 CreateImmersiveFullscreenController() override; 96 CreateImmersiveFullscreenController() override;
97 std::unique_ptr<KeyboardUI> CreateKeyboardUI() override;
97 std::unique_ptr<KeyEventWatcher> CreateKeyEventWatcher() override; 98 std::unique_ptr<KeyEventWatcher> CreateKeyEventWatcher() override;
98 SessionStateDelegate* GetSessionStateDelegate() override; 99 SessionStateDelegate* GetSessionStateDelegate() override;
99 void AddDisplayObserver(WmDisplayObserver* observer) override; 100 void AddDisplayObserver(WmDisplayObserver* observer) override;
100 void RemoveDisplayObserver(WmDisplayObserver* observer) override; 101 void RemoveDisplayObserver(WmDisplayObserver* observer) override;
101 void AddPointerWatcher(views::PointerWatcher* watcher, 102 void AddPointerWatcher(views::PointerWatcher* watcher,
102 views::PointerWatcherEventTypes events) override; 103 views::PointerWatcherEventTypes events) override;
103 void RemovePointerWatcher(views::PointerWatcher* watcher) override; 104 void RemovePointerWatcher(views::PointerWatcher* watcher) override;
104 bool IsTouchDown() override; 105 bool IsTouchDown() override;
105 void ToggleIgnoreExternalKeyboard() override; 106 void ToggleIgnoreExternalKeyboard() override;
106 void SetLaserPointerEnabled(bool enabled) override; 107 void SetLaserPointerEnabled(bool enabled) override;
(...skipping 18 matching lines...) Expand all
125 std::unique_ptr<ImmersiveHandlerFactoryMus> immersive_handler_factory_; 126 std::unique_ptr<ImmersiveHandlerFactoryMus> immersive_handler_factory_;
126 std::unique_ptr<SessionStateDelegate> session_state_delegate_; 127 std::unique_ptr<SessionStateDelegate> session_state_delegate_;
127 128
128 DISALLOW_COPY_AND_ASSIGN(WmShellMus); 129 DISALLOW_COPY_AND_ASSIGN(WmShellMus);
129 }; 130 };
130 131
131 } // namespace mus 132 } // namespace mus
132 } // namespace ash 133 } // namespace ash
133 134
134 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ 135 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_
OLDNEW
« no previous file with comments | « ash/metrics/user_metrics_recorder.cc ('k') | ash/mus/bridge/wm_shell_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698