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

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

Issue 2904993003: chromeos: changes how DisplayManagerObservers are notified (Closed)
Patch Set: cleanup Created 3 years, 7 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/mus/BUILD.gn ('k') | ash/mus/bridge/shell_port_mash.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_SHELL_PORT_MASH_H_ 5 #ifndef ASH_MUS_BRIDGE_SHELL_PORT_MASH_H_
6 #define ASH_MUS_BRIDGE_SHELL_PORT_MASH_H_ 6 #define ASH_MUS_BRIDGE_SHELL_PORT_MASH_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
11 #include <vector> 11 #include <vector>
12 12
13 #include "ash/display/window_tree_host_manager.h" 13 #include "ash/display/window_tree_host_manager.h"
14 #include "ash/shell_port.h" 14 #include "ash/shell_port.h"
15 #include "base/macros.h" 15 #include "base/macros.h"
16 16
17 namespace aura { 17 namespace aura {
18 class WindowTreeClient; 18 class WindowTreeClient;
19 } 19 }
20 20
21 namespace views { 21 namespace views {
22 class PointerWatcherEventRouter; 22 class PointerWatcherEventRouter;
23 } 23 }
24 24
25 namespace ash { 25 namespace ash {
26 26
27 class AcceleratorControllerDelegateAura; 27 class AcceleratorControllerDelegateAura;
28 class DisplaySynchronizer;
28 class PointerWatcherAdapter; 29 class PointerWatcherAdapter;
29 class RootWindowController; 30 class RootWindowController;
30 31
31 namespace mus { 32 namespace mus {
32 33
33 class AcceleratorControllerDelegateMus; 34 class AcceleratorControllerDelegateMus;
34 class AcceleratorControllerRegistrar; 35 class AcceleratorControllerRegistrar;
35 class ImmersiveHandlerFactoryMus; 36 class ImmersiveHandlerFactoryMus;
36 class WindowManager; 37 class WindowManager;
37 class ShellPortMashTestApi; 38 class ShellPortMashTestApi;
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 // TODO(sky): remove this once mash supports simple display management. 154 // TODO(sky): remove this once mash supports simple display management.
154 aura::Window* primary_root_window_; 155 aura::Window* primary_root_window_;
155 156
156 // Only one of |mash_state_| or |mus_state_| is created, depending upon 157 // Only one of |mash_state_| or |mus_state_| is created, depending upon
157 // Config. 158 // Config.
158 std::unique_ptr<MashSpecificState> mash_state_; 159 std::unique_ptr<MashSpecificState> mash_state_;
159 std::unique_ptr<MusSpecificState> mus_state_; 160 std::unique_ptr<MusSpecificState> mus_state_;
160 161
161 std::unique_ptr<SessionStateDelegate> session_state_delegate_; 162 std::unique_ptr<SessionStateDelegate> session_state_delegate_;
162 163
164 std::unique_ptr<DisplaySynchronizer> display_synchronizer_;
165
163 bool added_display_observer_ = false; 166 bool added_display_observer_ = false;
164 base::ObserverList<WmDisplayObserver> display_observers_; 167 base::ObserverList<WmDisplayObserver> display_observers_;
165 168
166 DISALLOW_COPY_AND_ASSIGN(ShellPortMash); 169 DISALLOW_COPY_AND_ASSIGN(ShellPortMash);
167 }; 170 };
168 171
169 } // namespace mus 172 } // namespace mus
170 } // namespace ash 173 } // namespace ash
171 174
172 #endif // ASH_MUS_BRIDGE_SHELL_PORT_MASH_H_ 175 #endif // ASH_MUS_BRIDGE_SHELL_PORT_MASH_H_
OLDNEW
« no previous file with comments | « ash/mus/BUILD.gn ('k') | ash/mus/bridge/shell_port_mash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698