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

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

Issue 2642003002: Removes ash::mus::RootWindowController (Closed)
Patch Set: feedback 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
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>
11 #include <vector> 11 #include <vector>
12 12
13 #include "ash/common/wm_shell.h" 13 #include "ash/common/wm_shell.h"
14 #include "base/macros.h" 14 #include "base/macros.h"
15 15
16 namespace aura { 16 namespace aura {
17 class WindowTreeClient; 17 class WindowTreeClient;
18 } 18 }
19 19
20 namespace views { 20 namespace views {
21 class PointerWatcherEventRouter; 21 class PointerWatcherEventRouter;
22 } 22 }
23 23
24 namespace ash { 24 namespace ash {
25
26 class RootWindowController;
27
25 namespace mus { 28 namespace mus {
26 29
27 class AcceleratorControllerDelegateMus; 30 class AcceleratorControllerDelegateMus;
28 class AcceleratorControllerRegistrar; 31 class AcceleratorControllerRegistrar;
29 class ImmersiveHandlerFactoryMus; 32 class ImmersiveHandlerFactoryMus;
30 class RootWindowController;
31 class WindowManager; 33 class WindowManager;
32 class WmShellMusTestApi; 34 class WmShellMusTestApi;
33 35
34 // WmShell implementation for mus. 36 // WmShell implementation for mus.
35 class WmShellMus : public WmShell { 37 class WmShellMus : public WmShell {
36 public: 38 public:
37 WmShellMus(WmWindow* primary_root_window, 39 WmShellMus(WmWindow* primary_root_window,
38 std::unique_ptr<ShellDelegate> shell_delegate, 40 std::unique_ptr<ShellDelegate> shell_delegate,
39 WindowManager* window_manager, 41 WindowManager* window_manager,
40 views::PointerWatcherEventRouter* pointer_watcher_event_router); 42 views::PointerWatcherEventRouter* pointer_watcher_event_router);
41 ~WmShellMus() override; 43 ~WmShellMus() override;
42 44
43 static WmShellMus* Get(); 45 static WmShellMus* Get();
44 46
45 RootWindowController* GetRootWindowControllerWithDisplayId(int64_t id); 47 ash::RootWindowController* GetRootWindowControllerWithDisplayId(int64_t id);
46 48
47 AcceleratorControllerDelegateMus* accelerator_controller_delegate() { 49 AcceleratorControllerDelegateMus* accelerator_controller_delegate() {
48 return accelerator_controller_delegate_.get(); 50 return accelerator_controller_delegate_.get();
49 } 51 }
50 52
51 aura::WindowTreeClient* window_tree_client(); 53 aura::WindowTreeClient* window_tree_client();
52 54
53 WindowManager* window_manager() { return window_manager_; } 55 WindowManager* window_manager() { return window_manager_; }
54 56
55 // WmShell: 57 // WmShell:
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 std::unique_ptr<ImmersiveHandlerFactoryMus> immersive_handler_factory_; 129 std::unique_ptr<ImmersiveHandlerFactoryMus> immersive_handler_factory_;
128 std::unique_ptr<SessionStateDelegate> session_state_delegate_; 130 std::unique_ptr<SessionStateDelegate> session_state_delegate_;
129 131
130 DISALLOW_COPY_AND_ASSIGN(WmShellMus); 132 DISALLOW_COPY_AND_ASSIGN(WmShellMus);
131 }; 133 };
132 134
133 } // namespace mus 135 } // namespace mus
134 } // namespace ash 136 } // namespace ash
135 137
136 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ 138 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698