Merges RootWindowControllerCommon into WmRootWindowController

ash/mus/bridge/wm_root_window_controller_mus.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_BRIDGE_WM_ROOT_WINDOW_CONTROLLER_MUS_H_
 #define ASH_MUS_BRIDGE_WM_ROOT_WINDOW_CONTROLLER_MUS_H_
 
 #include "ash/common/wm_root_window_controller.h"
 #include "base/macros.h"
-#include "base/observer_list.h"
 
 namespace display {
 class Display;
 }
 
 namespace ui {
 class Window;
 }
 
 namespace ash {
@@ skipping 24 matching lines @@
   gfx::Point ConvertPointToScreen(const WmWindowMus* source,
                                   const gfx::Point& point) const;
   gfx::Point ConvertPointFromScreen(const WmWindowMus* target,
                                     const gfx::Point& point) const;
 
   const display::Display& GetDisplay() const;
 
   // WmRootWindowController:
   bool HasShelf() override;
   WmShell* GetShell() override;
-  wm::WorkspaceWindowState GetWorkspaceWindowState() override;
-  void SetMaximizeBackdropDelegate(
-      std::unique_ptr<WorkspaceLayoutManagerBackdropDelegate> delegate)
-      override;
   AlwaysOnTopController* GetAlwaysOnTopController() override;
   WmShelf* GetShelf() override;
   WmWindow* GetWindow() override;
   void ConfigureWidgetInitParamsForContainer(
       views::Widget* widget,
       int shell_container_id,
       views::Widget::InitParams* init_params) override;
   WmWindow* FindEventTarget(const gfx::Point& location_in_screen) override;
   gfx::Point GetLastMouseLocationInRoot() override;
-  void AddObserver(WmRootWindowControllerObserver* observer) override;
-  void RemoveObserver(WmRootWindowControllerObserver* observer) override;
 
  private:
+  friend class RootWindowController;

[msw, 2016/08/30 21:26:46]

q: is this needed?

[sky, 2016/08/30 22:02:56]

Yes, as RootWindowController calls CreateContainers (and others), which is
protected.

+
   WmShellMus* shell_;
   RootWindowController* root_window_controller_;
   base::ObserverList<WmRootWindowControllerObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(WmRootWindowControllerMus);
 };
 
 }  // namespace mus
 }  // namespace ash
 
 #endif  // ASH_MUS_BRIDGE_WM_ROOT_WINDOW_CONTROLLER_MUS_H_