mash: Reverse the responsibilities of the NewWindowClient.

ash/common/wm_shell.h

Index: ash/common/wm_shell.h
diff --git a/ash/common/wm_shell.h b/ash/common/wm_shell.h
index 1dff4ae3131b6042aa392e9ed7087d56236e5568..65ad4a224964c49766a098168225dafb75667b19 100644
--- a/ash/common/wm_shell.h
+++ b/ash/common/wm_shell.h
@@ -54,6 +54,7 @@ class KeyboardUI;
 class LocaleNotificationController;
 class MaximizeModeController;
 class MruWindowTracker;
+class NewWindowController;
 class PaletteDelegate;
 class ScopedDisableInternalMouseAndKeyboard;
 class SessionStateDelegate;
@@ -83,10 +84,6 @@ class WorkspaceEventHandler;
 enum class LoginStatus;
 enum class TaskSwitchSource;
 
-namespace mojom {
-class NewWindowClient;
-}
-
 namespace wm {
 class MaximizeModeEventHandler;
 class WindowState;
@@ -145,8 +142,8 @@ class ASH_EXPORT WmShell {
 
   MediaDelegate* media_delegate() { return media_delegate_.get(); }
 
-  mojom::NewWindowClient* new_window_client() {
-    return new_window_client_.get();
+  NewWindowController* new_window_controller() {
+    return new_window_controller_.get();
   }
 
   // NOTE: Prefer ScopedRootWindowForNewWindows when setting temporarily.
@@ -492,7 +489,7 @@ class ASH_EXPORT WmShell {
   std::unique_ptr<MaximizeModeController> maximize_mode_controller_;
   std::unique_ptr<MediaDelegate> media_delegate_;
   std::unique_ptr<MruWindowTracker> mru_window_tracker_;
-  std::unique_ptr<mojom::NewWindowClient> new_window_client_;
+  std::unique_ptr<NewWindowController> new_window_controller_;
   std::unique_ptr<PaletteDelegate> palette_delegate_;
   std::unique_ptr<ShelfController> shelf_controller_;
   std::unique_ptr<ShelfDelegate> shelf_delegate_;