Makes ash/mus use RootWindowControllerCommon

ash/mus/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_MUS_ROOT_WINDOW_CONTROLLER_H_
 #define ASH_MUS_ROOT_WINDOW_CONTROLLER_H_
 
 #include <memory>
 
 #include "ash/mus/shelf_layout_manager_delegate.h"
@@ skipping 14 matching lines @@
 class Connector;
 }
 
 namespace ui {
 class Event;
 }
 
 namespace ash {
 
 class AlwaysOnTopController;
+class RootWindowControllerCommon;
 
 namespace mus {
 
 class LayoutManager;
 class ShadowController;
 class ShelfLayoutManager;
 class StatusLayoutManager;
 class WindowManager;
 class WindowManagerApplication;
 class WmRootWindowControllerMus;
 class WmShelfMus;
 class WmTestBase;
 class WmTestHelper;
+class WmWindowMus;
 
 // RootWindowController manages the windows and state for a single display.
 //
 // RootWindowController deletes itself when the root mus::Window is destroyed.
 // You can trigger deletion explicitly by way of Destroy().
 class RootWindowController : public ::mus::WindowObserver,
                              public ::mus::WindowTreeClientDelegate,
                              public ShelfLayoutManagerDelegate {
  public:
   static RootWindowController* CreateFromDisplay(
       WindowManagerApplication* app,
       ::mus::mojom::DisplayPtr display,
       mojo::InterfaceRequest<::mus::mojom::WindowTreeClient> client_request);
 
   // Deletes this.
   void Destroy();
 
   shell::Connector* GetConnector();
 
   ::mus::Window* root() { return root_; }
 
   int window_count() { return window_count_; }
   void IncrementWindowCount() { ++window_count_; }
 
   ::mus::Window* GetWindowForContainer(mojom::Container container);
-  bool WindowIsContainer(const ::mus::Window* window) const;
+  bool WindowIsContainer(::mus::Window* window);
+
+  WmWindowMus* GetWindowByShellWindowId(int id);
 
   WindowManager* window_manager() { return window_manager_.get(); }
 
   ::mus::WindowManagerClient* window_manager_client();
 
   void OnAccelerator(uint32_t id, const ui::Event& event);
 
   const display::Display& display() const { return display_; }
 
   ShelfLayoutManager* GetShelfLayoutManager();
@@ skipping 18 matching lines @@
   void OnEmbed(::mus::Window* root) override;
   void OnWindowTreeClientDestroyed(::mus::WindowTreeClient* client) override;
   void OnEventObserved(const ui::Event& event, ::mus::Window* target) override;
 
   // ::mus::WindowObserver:
   void OnWindowDestroyed(::mus::Window* window) override;
 
   // ShelfLayoutManagerDelegate:
   void OnShelfWindowAvailable() override;
 
-  // Sets up the window containers used for z-space management.
-  void CreateContainer(mojom::Container container,
-                       mojom::Container parent_container);
-  void CreateContainers();
+  // Creates the necessary set of layout managers in the shell windows.
+  void CreateLayoutManagers();
 
   WindowManagerApplication* app_;
   ::mus::Window* root_;
   int window_count_;
 
+  std::unique_ptr<RootWindowControllerCommon> root_window_controller_common_;
+
   std::unique_ptr<WmRootWindowControllerMus> wm_root_window_controller_;
   std::unique_ptr<WmShelfMus> wm_shelf_;
 
   std::unique_ptr<WindowManager> window_manager_;
 
   std::map<::mus::Window*, std::unique_ptr<LayoutManager>> layout_managers_;
 
   std::unique_ptr<ShadowController> shadow_controller_;
 
   display::Display display_;
 
   std::unique_ptr<AlwaysOnTopController> always_on_top_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(RootWindowController);
 };
 
 }  // namespace mus
 }  // namespace ash
 
 #endif  // ASH_MUS_ROOT_WINDOW_CONTROLLER_H_