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

Side by Side Diff: ash/common/root_window_controller_common.h

Issue 2292183003: Moves WorkspaceController to ash/common (Closed)
Patch Set: merge 2 trunk Created 4 years, 3 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_COMMON_ROOT_WINDOW_CONTROLLER_COMMON_H_ 5 #ifndef ASH_COMMON_ROOT_WINDOW_CONTROLLER_COMMON_H_
6 #define ASH_COMMON_ROOT_WINDOW_CONTROLLER_COMMON_H_ 6 #define ASH_COMMON_ROOT_WINDOW_CONTROLLER_COMMON_H_
7 7
8 #include <memory>
9
8 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
9 #include "base/macros.h" 11 #include "base/macros.h"
10 12
11 namespace ash { 13 namespace ash {
12 14
13 class WmWindow; 15 class WmWindow;
16 class WorkspaceController;
14 17
15 namespace wm { 18 namespace wm {
16 class RootWindowLayoutManager; 19 class RootWindowLayoutManager;
17 } 20 }
18 21
19 // This will eventually become what is RootWindowController. During the 22 // This will eventually become what is RootWindowController. During the
20 // transition it contains code used by both the aura and mus implementations. 23 // transition it contains code used by both the aura and mus implementations.
21 // It should *not* contain any aura specific code. 24 // It should *not* contain any aura specific code.
22 class ASH_EXPORT RootWindowControllerCommon { 25 class ASH_EXPORT RootWindowControllerCommon {
23 public: 26 public:
24 explicit RootWindowControllerCommon(WmWindow* root); 27 explicit RootWindowControllerCommon(WmWindow* root);
25 ~RootWindowControllerCommon(); 28 ~RootWindowControllerCommon();
26 29
27 // Creates the containers (WmWindows) used by the shell. 30 // Creates the containers (WmWindows) used by the shell.
28 void CreateContainers(); 31 void CreateContainers();
29 32
30 // Creates the LayoutManagers for the windows created by CreateContainers(). 33 // Creates the LayoutManagers for the windows created by CreateContainers().
31 void CreateLayoutManagers(); 34 void CreateLayoutManagers();
32 35
36 void DeleteWorkspaceController();
37
33 wm::RootWindowLayoutManager* root_window_layout() { 38 wm::RootWindowLayoutManager* root_window_layout() {
34 return root_window_layout_; 39 return root_window_layout_;
35 } 40 }
36 41
42 WorkspaceController* workspace_controller() {
43 return workspace_controller_.get();
44 }
45
37 private: 46 private:
38 WmWindow* root_; 47 WmWindow* root_;
39 48
40 wm::RootWindowLayoutManager* root_window_layout_; 49 wm::RootWindowLayoutManager* root_window_layout_;
41 50
51 std::unique_ptr<WorkspaceController> workspace_controller_;
52
42 DISALLOW_COPY_AND_ASSIGN(RootWindowControllerCommon); 53 DISALLOW_COPY_AND_ASSIGN(RootWindowControllerCommon);
43 }; 54 };
44 55
45 } // namespace ash 56 } // namespace ash
46 57
47 #endif // ASH_COMMON_ROOT_WINDOW_CONTROLLER_COMMON_H_ 58 #endif // ASH_COMMON_ROOT_WINDOW_CONTROLLER_COMMON_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698