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

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

Issue 2573703003: chromeos: Fix shelf appearing at login screen under mash (Closed)
Patch Set: rebase on session change, fix tests Created 4 years 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 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 override; 98 override;
99 std::unique_ptr<WorkspaceEventHandler> CreateWorkspaceEventHandler( 99 std::unique_ptr<WorkspaceEventHandler> CreateWorkspaceEventHandler(
100 WmWindow* workspace_window) override; 100 WmWindow* workspace_window) override;
101 std::unique_ptr<ScopedDisableInternalMouseAndKeyboard> 101 std::unique_ptr<ScopedDisableInternalMouseAndKeyboard>
102 CreateScopedDisableInternalMouseAndKeyboard() override; 102 CreateScopedDisableInternalMouseAndKeyboard() override;
103 std::unique_ptr<ImmersiveFullscreenController> 103 std::unique_ptr<ImmersiveFullscreenController>
104 CreateImmersiveFullscreenController() override; 104 CreateImmersiveFullscreenController() override;
105 std::unique_ptr<KeyEventWatcher> CreateKeyEventWatcher() override; 105 std::unique_ptr<KeyEventWatcher> CreateKeyEventWatcher() override;
106 void OnOverviewModeStarting() override; 106 void OnOverviewModeStarting() override;
107 void OnOverviewModeEnded() override; 107 void OnOverviewModeEnded() override;
108 void OnUserSessionStateActive() override;
108 SessionStateDelegate* GetSessionStateDelegate() override; 109 SessionStateDelegate* GetSessionStateDelegate() override;
109 void AddActivationObserver(WmActivationObserver* observer) override; 110 void AddActivationObserver(WmActivationObserver* observer) override;
110 void RemoveActivationObserver(WmActivationObserver* observer) override; 111 void RemoveActivationObserver(WmActivationObserver* observer) override;
111 void AddDisplayObserver(WmDisplayObserver* observer) override; 112 void AddDisplayObserver(WmDisplayObserver* observer) override;
112 void RemoveDisplayObserver(WmDisplayObserver* observer) override; 113 void RemoveDisplayObserver(WmDisplayObserver* observer) override;
113 void AddPointerWatcher(views::PointerWatcher* watcher, 114 void AddPointerWatcher(views::PointerWatcher* watcher,
114 views::PointerWatcherEventTypes events) override; 115 views::PointerWatcherEventTypes events) override;
115 void RemovePointerWatcher(views::PointerWatcher* watcher) override; 116 void RemovePointerWatcher(views::PointerWatcher* watcher) override;
116 void RequestShutdown() override; 117 void RequestShutdown() override;
117 bool IsTouchDown() override; 118 bool IsTouchDown() override;
(...skipping 28 matching lines...) Expand all
146 147
147 base::ObserverList<WmActivationObserver> activation_observers_; 148 base::ObserverList<WmActivationObserver> activation_observers_;
148 149
149 DISALLOW_COPY_AND_ASSIGN(WmShellMus); 150 DISALLOW_COPY_AND_ASSIGN(WmShellMus);
150 }; 151 };
151 152
152 } // namespace mus 153 } // namespace mus
153 } // namespace ash 154 } // namespace ash
154 155
155 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ 156 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698