Commit 0fbb8cde authored by sky's avatar sky Committed by Commit bot

Moves definitions of RootWindowController into root_window_controller.cc

As part of this I made sure the definitions and declarations matched
up. This resulted in reordering a couple of things. In addition the
only other non-move I did was moving what was CreateLayoutManagers()
into InitLayoutManagers() and CloseChildWindowsImpl() into
CloseChildWindows().

BUG=671246
TEST=none
R=jamescook@chromium.org

Review-Url: https://codereview.chromium.org/2628973002
Cr-Original-Commit-Position: refs/heads/master@{#443109}
Committed: https://chromium.googlesource.com/chromium/src/+/d20a89e7b56ad53a58f19edf4775528d066577d5
Review-Url: https://codereview.chromium.org/2628973002
Cr-Commit-Position: refs/heads/master@{#443166}
parent 904b7a6f
......@@ -595,7 +595,6 @@ component("ash") {
"common/wm_layout_manager.h",
"common/wm_lookup.cc",
"common/wm_lookup.h",
"common/wm_root_window_controller.cc",
"common/wm_shell.cc",
"common/wm_shell.h",
"common/wm_transient_window_observer.h",
......
This diff is collapsed.
This diff is collapsed.
......@@ -306,10 +306,6 @@ class ASH_EXPORT RootWindowController : public ShellObserver {
// Creates the containers (WmWindows) used by the shell.
void CreateContainers();
// Creates the LayoutManagers for the windows created by CreateContainers().
// TODO(sky): merge this with InitLayoutManagers().
void CreateLayoutManagers();
// Initializes |system_wallpaper_| and possibly also |boot_splash_screen_|.
// The initial color is determined by the |root_window_type| and whether or
// not this is the first boot.
......@@ -333,9 +329,6 @@ class ASH_EXPORT RootWindowController : public ShellObserver {
void OnLoginStateChanged(LoginStatus status) override;
void OnTouchHudProjectionToggled(bool enabled) override;
// TODO(sky): temporary, fold into CloseChildWindows().
void CloseChildWindowsImpl();
std::unique_ptr<AshWindowTreeHost> ash_host_;
std::unique_ptr<aura::WindowTreeHost> mus_window_tree_host_;
// This comes from |ash_host_| or |mus_window_tree_host_|.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment