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

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

Issue 2739763003: Moves maintaining ShellObservers back 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/high_contrast/high_contrast_controller.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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 override; 93 override;
94 std::unique_ptr<wm::MaximizeModeEventHandler> CreateMaximizeModeEventHandler() 94 std::unique_ptr<wm::MaximizeModeEventHandler> CreateMaximizeModeEventHandler()
95 override; 95 override;
96 std::unique_ptr<WorkspaceEventHandler> CreateWorkspaceEventHandler( 96 std::unique_ptr<WorkspaceEventHandler> CreateWorkspaceEventHandler(
97 WmWindow* workspace_window) override; 97 WmWindow* workspace_window) override;
98 std::unique_ptr<ScopedDisableInternalMouseAndKeyboard> 98 std::unique_ptr<ScopedDisableInternalMouseAndKeyboard>
99 CreateScopedDisableInternalMouseAndKeyboard() override; 99 CreateScopedDisableInternalMouseAndKeyboard() override;
100 std::unique_ptr<ImmersiveFullscreenController> 100 std::unique_ptr<ImmersiveFullscreenController>
101 CreateImmersiveFullscreenController() override; 101 CreateImmersiveFullscreenController() override;
102 std::unique_ptr<KeyEventWatcher> CreateKeyEventWatcher() override; 102 std::unique_ptr<KeyEventWatcher> CreateKeyEventWatcher() override;
103 void OnOverviewModeStarting() override;
104 void OnOverviewModeEnded() override;
105 SessionStateDelegate* GetSessionStateDelegate() override; 103 SessionStateDelegate* GetSessionStateDelegate() override;
106 void AddDisplayObserver(WmDisplayObserver* observer) override; 104 void AddDisplayObserver(WmDisplayObserver* observer) override;
107 void RemoveDisplayObserver(WmDisplayObserver* observer) override; 105 void RemoveDisplayObserver(WmDisplayObserver* observer) override;
108 void AddPointerWatcher(views::PointerWatcher* watcher, 106 void AddPointerWatcher(views::PointerWatcher* watcher,
109 views::PointerWatcherEventTypes events) override; 107 views::PointerWatcherEventTypes events) override;
110 void RemovePointerWatcher(views::PointerWatcher* watcher) override; 108 void RemovePointerWatcher(views::PointerWatcher* watcher) override;
111 bool IsTouchDown() override; 109 bool IsTouchDown() override;
112 void ToggleIgnoreExternalKeyboard() override; 110 void ToggleIgnoreExternalKeyboard() override;
113 void SetLaserPointerEnabled(bool enabled) override; 111 void SetLaserPointerEnabled(bool enabled) override;
114 void SetPartialMagnifierEnabled(bool enabled) override; 112 void SetPartialMagnifierEnabled(bool enabled) override;
(...skipping 16 matching lines...) Expand all
131 std::unique_ptr<ImmersiveHandlerFactoryMus> immersive_handler_factory_; 129 std::unique_ptr<ImmersiveHandlerFactoryMus> immersive_handler_factory_;
132 std::unique_ptr<SessionStateDelegate> session_state_delegate_; 130 std::unique_ptr<SessionStateDelegate> session_state_delegate_;
133 131
134 DISALLOW_COPY_AND_ASSIGN(WmShellMus); 132 DISALLOW_COPY_AND_ASSIGN(WmShellMus);
135 }; 133 };
136 134
137 } // namespace mus 135 } // namespace mus
138 } // namespace ash 136 } // namespace ash
139 137
140 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ 138 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_
OLDNEW
« no previous file with comments | « ash/high_contrast/high_contrast_controller.cc ('k') | ash/mus/bridge/wm_shell_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698