Revert of Moves definitions of RootWindowController into root_window_controller.cc

ash/root_window_controller.h

 // Copyright (c) 2012 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_ROOT_WINDOW_CONTROLLER_H_
 #define ASH_ROOT_WINDOW_CONTROLLER_H_
 
 #include <map>
 #include <memory>
 
@@ skipping 288 matching lines @@
                        aura::WindowTreeHost* window_tree_host);
 
   // Initializes the RootWindowController based on |root_window_type|.
   void Init(RootWindowType root_window_type);
 
   void InitLayoutManagers();
 
   // 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.
   void CreateSystemWallpaper(RootWindowType root_window_type);
 
   // Enables projection touch HUD.
   void EnableTouchHudProjection();
 
   // Disables projection touch HUD.
   void DisableTouchHudProjection();
 
   // Resets WmShell::GetRootWindowForNewWindows() if appropriate. This is called
   // during shutdown to make sure GetRootWindowForNewWindows() isn't referencing
   // this.
   void ResetRootForNewWindowsIfNecessary();
 
   // Callback for MenuModelAdapter.
   void OnMenuClosed();
 
   // Overridden from 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_|.
   aura::WindowTreeHost* window_tree_host_;
 
   // LayoutManagers are owned by the window they are installed on.
   DockedWindowLayoutManager* docked_window_layout_manager_ = nullptr;
   PanelLayoutManager* panel_layout_manager_ = nullptr;
   wm::RootWindowLayoutManager* root_window_layout_manager_ = nullptr;
 
@@ skipping 38 matching lines @@
 
 // On classic ash, returns the RootWindowController for the given |root_window|.
 // On mus ash, returns the RootWindowController for the primary display.
 // See RootWindowController class comment above.
 ASH_EXPORT RootWindowController* GetRootWindowController(
     const aura::Window* root_window);
 
 }  // namespace ash
 
 #endif  // ASH_ROOT_WINDOW_CONTROLLER_H_