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

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

Issue 2491403003: chromeos: Move SystemTrayDelegate::RequestShutdown to WmShell (Closed)
Patch Set: Created 4 years, 1 month 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 OnOverviewModeStarting() override; 101 void OnOverviewModeStarting() override;
102 void OnOverviewModeEnded() override; 102 void OnOverviewModeEnded() override;
103 SessionStateDelegate* GetSessionStateDelegate() override; 103 SessionStateDelegate* GetSessionStateDelegate() override;
104 void AddActivationObserver(WmActivationObserver* observer) override; 104 void AddActivationObserver(WmActivationObserver* observer) override;
105 void RemoveActivationObserver(WmActivationObserver* observer) override; 105 void RemoveActivationObserver(WmActivationObserver* observer) override;
106 void AddDisplayObserver(WmDisplayObserver* observer) override; 106 void AddDisplayObserver(WmDisplayObserver* observer) override;
107 void RemoveDisplayObserver(WmDisplayObserver* observer) override; 107 void RemoveDisplayObserver(WmDisplayObserver* observer) override;
108 void AddPointerWatcher(views::PointerWatcher* watcher, 108 void AddPointerWatcher(views::PointerWatcher* watcher,
109 views::PointerWatcherEventTypes events) override; 109 views::PointerWatcherEventTypes events) override;
110 void RemovePointerWatcher(views::PointerWatcher* watcher) override; 110 void RemovePointerWatcher(views::PointerWatcher* watcher) override;
111 void RequestShutdown() override;
111 bool IsTouchDown() override; 112 bool IsTouchDown() override;
112 #if defined(OS_CHROMEOS) 113 #if defined(OS_CHROMEOS)
113 void ToggleIgnoreExternalKeyboard() override; 114 void ToggleIgnoreExternalKeyboard() override;
114 void SetLaserPointerEnabled(bool enabled) override; 115 void SetLaserPointerEnabled(bool enabled) override;
115 #endif 116 #endif
116 117
117 private: 118 private:
118 friend class WmShellMusTestApi; 119 friend class WmShellMusTestApi;
119 120
120 ui::WindowTreeClient* window_tree_client(); 121 ui::WindowTreeClient* window_tree_client();
(...skipping 21 matching lines...) Expand all
142 143
143 base::ObserverList<WmActivationObserver> activation_observers_; 144 base::ObserverList<WmActivationObserver> activation_observers_;
144 145
145 DISALLOW_COPY_AND_ASSIGN(WmShellMus); 146 DISALLOW_COPY_AND_ASSIGN(WmShellMus);
146 }; 147 };
147 148
148 } // namespace mus 149 } // namespace mus
149 } // namespace ash 150 } // namespace ash
150 151
151 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ 152 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698