Promotes WmWindowMus functions to WmWindowAura and nukes WmWindowMus

ash/shell.h

 // Copyright (c) 2012 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_SHELL_H_
 #define ASH_SHELL_H_
 
 #include <memory>
 #include <utility>
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "ash/metrics/user_metrics_recorder.h"
 #include "ash/public/cpp/shelf_types.h"
 #include "ash/wm/cursor_manager_chromeos.h"
 #include "ash/wm/system_modal_container_event_filter_delegate.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "ui/aura/window.h"
 #include "ui/display/screen.h"
 #include "ui/events/event_target.h"
 #include "ui/wm/core/cursor_manager.h"
 
 namespace aura {
 class RootWindow;
 class Window;
+class WindowManagerClient;
 class WindowTreeClient;
 namespace client {
 class ActivationClient;
 class FocusClient;
 }
 }
 
 namespace chromeos {
 class AudioA11yController;
 }
@@ skipping 139 matching lines @@
   static int64_t GetTargetDisplayId();
 
   // Returns all root windows.
   static aura::Window::Windows GetAllRootWindows();
 
   static aura::Window* GetContainer(aura::Window* root_window,
                                     int container_id);
   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

[msw, 2017/01/12 00:14:42]

q: What is ShellMash? WmShell?

[sky, 2017/01/12 14:43:44]

WmShell will go away soon. When that happens we'll want to move bits of Shell
that are applicable to a specific environment off this class. I'm thinking those
are named ShellCash and ShellMash. Those names aren't set in stone.

+  // 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;
   }
 
   static aura::WindowTreeClient* window_tree_client() {
     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(
       views::Widget* widget);
 
   // Sets work area insets of the display containing |window|, pings observers.
   void SetDisplayWorkAreaInsets(aura::Window* window,
                                 const gfx::Insets& insets);
 
   // Called when the user logs in.
@@ skipping 212 matching lines @@
   // Overridden from ui::EventTarget:
   bool CanAcceptEvent(const ui::Event& event) override;
   EventTarget* GetParentTarget() override;
   std::unique_ptr<ui::EventTargetIterator> GetChildIterator() const override;
   ui::EventTargeter* GetEventTargeter() override;
 
   static Shell* instance_;
 
   // 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.
   static bool initially_hide_cursor_;
 
   std::unique_ptr<ScopedOverviewAnimationSettingsFactoryAura>
       scoped_overview_animation_settings_factory_;
   std::unique_ptr<WmShellAura> wm_shell_;
 
   // The CompoundEventFilter owned by aura::Env object.
@@ skipping 102 matching lines @@
   std::unique_ptr<GPUSupport> gpu_support_;
 
   std::unique_ptr<ImmersiveHandlerFactoryAsh> immersive_handler_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_