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

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

Issue 2277563002: Wires up immersive mode for chrome and mash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix crash Created 4 years, 4 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
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 14 matching lines...) Expand all
25 25
26 namespace views { 26 namespace views {
27 class PointerWatcherEventRouter; 27 class PointerWatcherEventRouter;
28 } 28 }
29 29
30 namespace ash { 30 namespace ash {
31 namespace mus { 31 namespace mus {
32 32
33 class AcceleratorControllerDelegateMus; 33 class AcceleratorControllerDelegateMus;
34 class AcceleratorControllerRegistrar; 34 class AcceleratorControllerRegistrar;
35 class ImmersiveHandlerFactoryMus;
35 class WindowManager; 36 class WindowManager;
36 class WmRootWindowControllerMus; 37 class WmRootWindowControllerMus;
37 class WmShellMusTestApi; 38 class WmShellMusTestApi;
38 class WmWindowMus; 39 class WmWindowMus;
39 40
40 // WmShell implementation for mus. 41 // WmShell implementation for mus.
41 class WmShellMus : public WmShell, public ui::WindowTreeClientObserver { 42 class WmShellMus : public WmShell, public ui::WindowTreeClientObserver {
42 public: 43 public:
43 WmShellMus(std::unique_ptr<ShellDelegate> shell_delegate, 44 WmShellMus(std::unique_ptr<ShellDelegate> shell_delegate,
44 WindowManager* window_manager, 45 WindowManager* window_manager,
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 WindowManager* window_manager_; 129 WindowManager* window_manager_;
129 130
130 views::PointerWatcherEventRouter* pointer_watcher_event_router_; 131 views::PointerWatcherEventRouter* pointer_watcher_event_router_;
131 132
132 std::vector<WmRootWindowControllerMus*> root_window_controllers_; 133 std::vector<WmRootWindowControllerMus*> root_window_controllers_;
133 134
134 std::unique_ptr<AcceleratorControllerDelegateMus> 135 std::unique_ptr<AcceleratorControllerDelegateMus>
135 accelerator_controller_delegate_; 136 accelerator_controller_delegate_;
136 std::unique_ptr<AcceleratorControllerRegistrar> 137 std::unique_ptr<AcceleratorControllerRegistrar>
137 accelerator_controller_registrar_; 138 accelerator_controller_registrar_;
139 std::unique_ptr<ImmersiveHandlerFactoryMus> immersive_handler_factory_;
138 std::unique_ptr<SessionStateDelegate> session_state_delegate_; 140 std::unique_ptr<SessionStateDelegate> session_state_delegate_;
139 141
140 base::ObserverList<WmActivationObserver> activation_observers_; 142 base::ObserverList<WmActivationObserver> activation_observers_;
141 143
142 DISALLOW_COPY_AND_ASSIGN(WmShellMus); 144 DISALLOW_COPY_AND_ASSIGN(WmShellMus);
143 }; 145 };
144 146
145 } // namespace mus 147 } // namespace mus
146 } // namespace ash 148 } // namespace ash
147 149
148 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ 150 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698