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

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

Issue 2618143002: cros: Remove some OS platform ifdefs from ash (Closed)
Patch Set: rebase Created 3 years, 11 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 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 void RequestShutdown() override;
112 bool IsTouchDown() override; 112 bool IsTouchDown() override;
113 #if defined(OS_CHROMEOS)
114 void ToggleIgnoreExternalKeyboard() override; 113 void ToggleIgnoreExternalKeyboard() override;
115 void SetLaserPointerEnabled(bool enabled) override; 114 void SetLaserPointerEnabled(bool enabled) override;
116 #endif
117 115
118 private: 116 private:
119 friend class WmShellMusTestApi; 117 friend class WmShellMusTestApi;
120 118
121 // aura::client::ActivationChangeObserver: 119 // aura::client::ActivationChangeObserver:
122 void OnWindowActivated(ActivationReason reason, 120 void OnWindowActivated(ActivationReason reason,
123 aura::Window* gained_active, 121 aura::Window* gained_active,
124 aura::Window* lost_active) override; 122 aura::Window* lost_active) override;
125 123
126 WindowManager* window_manager_; 124 WindowManager* window_manager_;
(...skipping 11 matching lines...) Expand all
138 136
139 base::ObserverList<WmActivationObserver> activation_observers_; 137 base::ObserverList<WmActivationObserver> activation_observers_;
140 138
141 DISALLOW_COPY_AND_ASSIGN(WmShellMus); 139 DISALLOW_COPY_AND_ASSIGN(WmShellMus);
142 }; 140 };
143 141
144 } // namespace mus 142 } // namespace mus
145 } // namespace ash 143 } // namespace ash
146 144
147 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ 145 #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