Merges RootWindowControllerCommon into WmRootWindowController

ash/root_window_controller.h

Index: ash/root_window_controller.h
diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h
index 740d0802083fd91f3f2b2808949effa88ec2f419..8f2038a77ad095d6e87d9453fe3b2d8dfe0daa5e 100644
--- a/ash/root_window_controller.h
+++ b/ash/root_window_controller.h
@@ -55,7 +55,6 @@ class AnimatingWallpaperWidgetController;
 class DockedWindowLayoutManager;
 enum class LoginStatus;
 class PanelLayoutManager;
-class RootWindowControllerCommon;
 class Shelf;
 class ShelfLayoutManager;
 class ShelfWidget;
@@ -67,6 +66,7 @@ class SystemWallpaperController;
 class TouchHudDebug;
 class TouchHudProjection;
 class WallpaperWidgetController;
+class WmRootWindowControllerAura;
 class WmShelfAura;
 class WmWindow;
 class WorkspaceController;
@@ -270,7 +270,8 @@ class ASH_EXPORT RootWindowController : public ShellObserver {
 
   std::unique_ptr<AshWindowTreeHost> ash_host_;
 
-  std::unique_ptr<RootWindowControllerCommon> root_window_controller_common_;
+  // Owned by GetRootWindow().

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

nit: s/GetRootWindow()/the root window/ or similar?

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

Done.

+  WmRootWindowControllerAura* wm_root_window_controller_ = nullptr;

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

nit: avoid using the aura sublcass for the pointer here?

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

It has to be Aura here so that resolution to friend works correctly. Without
this compiler sees call to WmRootWindowController->Foo(), which is different
than WmRootWindowControllerAura->Foo()

 
   std::unique_ptr<StackingController> stacking_controller_;