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

Unified Diff: ash/common/root_window_controller_common.h

Issue 2297893002: Merges RootWindowControllerCommon into WmRootWindowController (Closed)
Patch Set: feedback 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/aura/wm_root_window_controller_aura.cc ('k') | ash/common/root_window_controller_common.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/root_window_controller_common.h
diff --git a/ash/common/root_window_controller_common.h b/ash/common/root_window_controller_common.h
deleted file mode 100644
index 90525ec1986aef9c823596b13c87156ad7d23e1d..0000000000000000000000000000000000000000
--- a/ash/common/root_window_controller_common.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef ASH_COMMON_ROOT_WINDOW_CONTROLLER_COMMON_H_
-#define ASH_COMMON_ROOT_WINDOW_CONTROLLER_COMMON_H_
-
-#include <memory>
-
-#include "ash/ash_export.h"
-#include "base/macros.h"
-
-namespace ash {
-
-class WmWindow;
-class WorkspaceController;
-
-namespace wm {
-class RootWindowLayoutManager;
-}
-
-// This will eventually become what is RootWindowController. During the
-// transition it contains code used by both the aura and mus implementations.
-// It should *not* contain any aura specific code.
-class ASH_EXPORT RootWindowControllerCommon {
- public:
- explicit RootWindowControllerCommon(WmWindow* root);
- ~RootWindowControllerCommon();
-
- // Creates the containers (WmWindows) used by the shell.
- void CreateContainers();
-
- // Creates the LayoutManagers for the windows created by CreateContainers().
- void CreateLayoutManagers();
-
- void DeleteWorkspaceController();
-
- wm::RootWindowLayoutManager* root_window_layout() {
- return root_window_layout_;
- }
-
- WorkspaceController* workspace_controller() {
- return workspace_controller_.get();
- }
-
- private:
- WmWindow* root_;
-
- wm::RootWindowLayoutManager* root_window_layout_;
-
- std::unique_ptr<WorkspaceController> workspace_controller_;
-
- DISALLOW_COPY_AND_ASSIGN(RootWindowControllerCommon);
-};
-
-} // namespace ash
-
-#endif // ASH_COMMON_ROOT_WINDOW_CONTROLLER_COMMON_H_
« no previous file with comments | « ash/aura/wm_root_window_controller_aura.cc ('k') | ash/common/root_window_controller_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698