Promotes WmWindowMus functions to WmWindowAura and nukes WmWindowMus

ash/shell.h

Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index f7890a47456ef21c6c21fd25af0fedf40ae6fe1a..401726f5a55ae4bae8f23c44b93d1c24f7b16a7b 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -26,6 +26,7 @@
 namespace aura {
 class RootWindow;
 class Window;
+class WindowManagerClient;
 class WindowTreeClient;
 namespace client {
 class ActivationClient;
@@ -185,7 +186,8 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
   static const aura::Window* GetContainer(const aura::Window* root_window,
                                           int container_id);
 
-  // TODO(sky): better isolate this.
+  // TODO(sky): move this and WindowManagerClient into ShellMash that is owned
+  // by Shell. Doing the move is gated on having mash create Shell.
   static void set_window_tree_client(aura::WindowTreeClient* client) {
     window_tree_client_ = client;
   }
@@ -194,6 +196,13 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
     return window_tree_client_;
   }
 
+  static void set_window_manager_client(aura::WindowManagerClient* client) {
+    window_manager_client_ = client;
+  }
+  static aura::WindowManagerClient* window_manager_client() {
+    return window_manager_client_;
+  }
+
   // Creates a default views::NonClientFrameView for use by windows in the
   // Ash environment.
   views::NonClientFrameView* CreateDefaultNonClientFrameView(
@@ -423,6 +432,7 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
 
   // Only valid in mash, for classic ash this is null.
   static aura::WindowTreeClient* window_tree_client_;
+  static aura::WindowManagerClient* window_manager_client_;
 
   // If set before the Shell is initialized, the mouse cursor will be hidden
   // when the screen is initially created.