Centralizes more shared code between ash and mash

ash/common/wm_root_window_controller.h

 // 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_WM_ROOT_WINDOW_CONTROLLER_H_
 #define ASH_COMMON_WM_ROOT_WINDOW_CONTROLLER_H_
 
 #include "ash/ash_export.h"
 #include "ash/common/wm/workspace/workspace_types.h"
 #include "base/macros.h"
@@ skipping 10 matching lines @@
 
 namespace views {
 class MenuModelAdapter;
 class MenuRunner;
 }
 
 namespace ash {
 
 class AlwaysOnTopController;
 class AnimatingWallpaperWidgetController;
+class DockedWindowLayoutManager;
+class PanelLayoutManager;
 class SystemModalContainerLayoutManager;
 class WallpaperWidgetController;
 class WmShelf;
 class WmShell;
 class WmWindow;
 class WorkspaceController;
 
 namespace wm {
 class RootWindowLayoutManager;
 }
 
 // Provides state associated with a root of a window hierarchy.
 class ASH_EXPORT WmRootWindowController {
  public:
   explicit WmRootWindowController(WmWindow* window);
   virtual ~WmRootWindowController();
 
+  DockedWindowLayoutManager* docked_window_layout_manager() {
+    return docked_window_layout_manager_;
+  }
+
+  PanelLayoutManager* panel_layout_manager() { return panel_layout_manager_; }
+
   wm::RootWindowLayoutManager* root_window_layout_manager() {
     return root_window_layout_manager_;
   }
 
   WallpaperWidgetController* wallpaper_widget_controller() {
     return wallpaper_widget_controller_.get();
   }
   void SetWallpaperWidgetController(WallpaperWidgetController* controller);
 
   AnimatingWallpaperWidgetController* animating_wallpaper_widget_controller() {
@@ skipping 15 matching lines @@
   // If no window is specified (i.e. |window| is null), then the lockscreen
   // modal container is used if the screen is currently locked. Otherwise, the
   // default modal container is used.
   SystemModalContainerLayoutManager* GetSystemModalLayoutManager(
       WmWindow* window);
 
   virtual bool HasShelf() = 0;
 
   virtual WmShell* GetShell() = 0;
 
-  virtual AlwaysOnTopController* GetAlwaysOnTopController() = 0;
+  AlwaysOnTopController* always_on_top_controller() {

[James Cook, 2016/09/21 22:03:18]

nit: move this up with other inline getters

[sky, 2016/09/21 22:47:48]

Done.

+    return always_on_top_controller_.get();
+  }
 
   virtual WmShelf* GetShelf() = 0;
 
   // Returns the window associated with this WmRootWindowController.
   virtual WmWindow* GetWindow() = 0;
 
   // Gets the WmWindow whose shell window id is |container_id|.
   WmWindow* GetContainer(int container_id);
   const WmWindow* GetContainer(int container_id) const;
 
@@ skipping 27 matching lines @@
  protected:
   // Moves child windows to |dest|.
   void MoveWindowsTo(WmWindow* dest);
 
   // Creates the containers (WmWindows) used by the shell.
   void CreateContainers();
 
   // Creates the LayoutManagers for the windows created by CreateContainers().
   void CreateLayoutManagers();
 
-  void DeleteWorkspaceController();
+  // Resets WmShell::GetRootWindowForNewWindows() if appropriate. This is called
+  // during shutdown to make sure GetRootWindowForNewWindows() isn't referencing
+  // this.
+  void ResetRootForNewWindowsIfNecessary();
+
+  // Called during shutdown to destroy state such as windows and LayoutManagers.
+  void CloseChildWindows();
+
+  // Called from CloseChildWindows() to determine if the specified window should
+  // be destroyed.
+  virtual bool ShouldDestroyWindowInCloseChildWindows(WmWindow* window) = 0;
 
  private:
   // Callback for MenuModelAdapter.
   void OnMenuClosed();
 
   WmWindow* root_;
 
-  wm::RootWindowLayoutManager* root_window_layout_manager_;
+  // LayoutManagers are owned by the window they are installed on.

[James Cook, 2016/09/21 22:03:18]

+1 for helpful ownership comment

+  DockedWindowLayoutManager* docked_window_layout_manager_ = nullptr;
+  PanelLayoutManager* panel_layout_manager_ = nullptr;
+  wm::RootWindowLayoutManager* root_window_layout_manager_ = nullptr;
 
   std::unique_ptr<WallpaperWidgetController> wallpaper_widget_controller_;
   std::unique_ptr<AnimatingWallpaperWidgetController>
       animating_wallpaper_widget_controller_;
   std::unique_ptr<WorkspaceController> workspace_controller_;
 
+  std::unique_ptr<AlwaysOnTopController> always_on_top_controller_;
+
   // Manages the context menu.
   std::unique_ptr<ui::MenuModel> menu_model_;
   std::unique_ptr<views::MenuModelAdapter> menu_model_adapter_;
   std::unique_ptr<views::MenuRunner> menu_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(WmRootWindowController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_WM_ROOT_WINDOW_CONTROLLER_H_