Promotes WmWindowMus functions to WmWindowAura and nukes WmWindowMus

ash/mus/window_manager.cc

 // Copyright 2015 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.
 
 #include "ash/mus/window_manager.h"
 
 #include <stdint.h>
 
 #include <utility>
 
+#include "ash/aura/wm_window_aura.h"
 #include "ash/common/session/session_controller.h"
 #include "ash/common/wm/container_finder.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/display/screen_position_controller.h"
 #include "ash/mus/accelerators/accelerator_handler.h"
 #include "ash/mus/accelerators/accelerator_ids.h"
 #include "ash/mus/bridge/wm_lookup_mus.h"
 #include "ash/mus/bridge/wm_shell_mus.h"
-#include "ash/mus/bridge/wm_window_mus.h"
 #include "ash/mus/move_event_handler.h"
 #include "ash/mus/non_client_frame_controller.h"
 #include "ash/mus/property_util.h"
 #include "ash/mus/root_window_controller.h"
 #include "ash/mus/screen_mus.h"
 #include "ash/mus/shadow_controller.h"
 #include "ash/mus/shell_delegate_mus.h"
 #include "ash/mus/window_manager_observer.h"
 #include "ash/mus/window_properties.h"
 #include "ash/public/cpp/shell_window_ids.h"
@@ skipping 59 matching lines @@
       kPanelAttachedKey, ui::mojom::WindowManager::kPanelAttached_Property);
   property_converter_->RegisterProperty(
       kRenderTitleAreaProperty,
       ui::mojom::WindowManager::kRenderParentTitleArea_Property);
   property_converter_->RegisterProperty(
       kShelfItemTypeKey, ui::mojom::WindowManager::kShelfItemType_Property);
 }
 
 WindowManager::~WindowManager() {
   Shutdown();
-  aura::Env::GetInstance()->RemoveObserver(this);
   ash::Shell::set_window_tree_client(nullptr);
+  ash::Shell::set_window_manager_client(nullptr);
 }
 
 void WindowManager::Init(
     std::unique_ptr<aura::WindowTreeClient> window_tree_client,
     const scoped_refptr<base::SequencedWorkerPool>& blocking_pool) {
   DCHECK(window_manager_client_);
   DCHECK(!window_tree_client_);
   window_tree_client_ = std::move(window_tree_client);
 
   DCHECK_EQ(nullptr, ash::Shell::window_tree_client());
   ash::Shell::set_window_tree_client(window_tree_client_.get());
 
-  aura::Env::GetInstance()->AddObserver(this);
-
   // |connector_| will be null in some tests.
   if (connector_)
     connector_->BindInterface(ui::mojom::kServiceName, &display_controller_);
 
   screen_ = base::MakeUnique<ScreenMus>();
   display::Screen::SetScreenInstance(screen_.get());
 
   pointer_watcher_event_router_ =
       base::MakeUnique<views::PointerWatcherEventRouter>(
           window_tree_client_.get());
@@ skipping 24 matching lines @@
 aura::Window* WindowManager::NewTopLevelWindow(
     ui::mojom::WindowType window_type,
     std::map<std::string, std::vector<uint8_t>>* properties) {
   RootWindowController* root_window_controller =
       GetRootWindowControllerForNewTopLevelWindow(properties);
   aura::Window* window =
       root_window_controller->NewTopLevelWindow(window_type, properties);
   if (properties->count(
           ui::mojom::WindowManager::kWindowIgnoredByShelf_Property)) {
     wm::WindowState* window_state =
-        static_cast<WmWindow*>(WmWindowMus::Get(window))->GetWindowState();
+        static_cast<WmWindow*>(WmWindowAura::Get(window))->GetWindowState();
     window_state->set_ignored_by_shelf(mojo::ConvertTo<bool>(
         (*properties)
             [ui::mojom::WindowManager::kWindowIgnoredByShelf_Property]));
     // No need to persist this value.
     properties->erase(ui::mojom::WindowManager::kWindowIgnoredByShelf_Property);
   }
   return window;
 }
 
 std::set<RootWindowController*> WindowManager::GetRootWindowControllers() {
@@ skipping 132 matching lines @@
 
   window_tree_client_.reset();
   window_manager_client_ = nullptr;
 
   DCHECK_EQ(screen_.get(), display::Screen::GetScreen());
   display::Screen::SetScreenInstance(nullptr);
 }
 
 RootWindowController* WindowManager::GetPrimaryRootWindowController() {
   return RootWindowController::ForWindow(
-      static_cast<WmWindowMus*>(
+      static_cast<WmWindowAura*>(
           WmShell::Get()->GetPrimaryRootWindowController()->GetWindow())
           ->aura_window());
 }
 
 RootWindowController*
 WindowManager::GetRootWindowControllerForNewTopLevelWindow(
     std::map<std::string, std::vector<uint8_t>>* properties) {
   // If a specific display was requested, use it.
   const int64_t display_id = GetInitialDisplayId(*properties);
   for (auto& root_window_controller_ptr : root_window_controllers_) {
     if (root_window_controller_ptr->display().id() == display_id)
       return root_window_controller_ptr.get();
   }
 
   return RootWindowController::ForWindow(
-      static_cast<WmWindowMus*>(WmShellMus::Get()->GetRootWindowForNewWindows())
+      static_cast<WmWindowAura*>(
+          WmShellMus::Get()->GetRootWindowForNewWindows())
           ->aura_window());
 }
 
 void WindowManager::OnEmbed(
     std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) {
   // WindowManager should never see this, instead OnWmNewDisplay() is called.
   NOTREACHED();
 }
 
 void WindowManager::OnEmbedRootDestroyed(
@@ skipping 17 matching lines @@
 aura::client::CaptureClient* WindowManager::GetCaptureClient() {
   return wm_state_->capture_controller();
 }
 
 aura::PropertyConverter* WindowManager::GetPropertyConverter() {
   return property_converter_.get();
 }
 
 void WindowManager::SetWindowManagerClient(aura::WindowManagerClient* client) {
   window_manager_client_ = client;
+  ash::Shell::set_window_manager_client(client);
 }
 
 bool WindowManager::OnWmSetBounds(aura::Window* window, gfx::Rect* bounds) {
   // TODO(sky): this indirectly sets bounds, which is against what
   // OnWmSetBounds() recommends doing. Remove that restriction, or fix this.
-  WmWindowMus::Get(window)->SetBounds(*bounds);
+  WmWindowAura::Get(window)->SetBounds(*bounds);
   *bounds = window->bounds();
   return true;
 }
 
 bool WindowManager::OnWmSetProperty(
     aura::Window* window,
     const std::string& name,
     std::unique_ptr<std::vector<uint8_t>>* new_data) {
   // TODO(sky): constrain this to set of keys we know about, and allowed values.
   if (name == ui::mojom::WindowManager::kWindowIgnoredByShelf_Property) {
-    wm::WindowState* window_state =
-        static_cast<WmWindow*>(WmWindowMus::Get(window))->GetWindowState();
+    wm::WindowState* window_state = WmWindowAura::Get(window)->GetWindowState();
     window_state->set_ignored_by_shelf(
         new_data ? mojo::ConvertTo<bool>(**new_data) : false);
     return false;  // Won't attempt to map through property converter.
   }
   return name == ui::mojom::WindowManager::kAppIcon_Property ||
          name == ui::mojom::WindowManager::kShowState_Property ||
          name == ui::mojom::WindowManager::kPreferredSize_Property ||
          name == ui::mojom::WindowManager::kResizeBehavior_Property ||
          name == ui::mojom::WindowManager::kShelfItemType_Property ||
          name == ui::mojom::WindowManager::kWindowIcon_Property ||
@@ skipping 65 matching lines @@
   }
 
   NOTREACHED();
 }
 
 void WindowManager::OnWmPerformMoveLoop(
     aura::Window* window,
     ui::mojom::MoveLoopSource source,
     const gfx::Point& cursor_location,
     const base::Callback<void(bool)>& on_done) {
-  WmWindowMus* child_window = WmWindowMus::Get(window);
+  WmWindowAura* child_window = WmWindowAura::Get(window);
   MoveEventHandler* handler = MoveEventHandler::GetForWindow(child_window);
   if (!handler) {
     on_done.Run(false);
     return;
   }
 
   DCHECK(!handler->IsDragInProgress());
   aura::client::WindowMoveSource aura_source =
       source == ui::mojom::MoveLoopSource::MOUSE
           ? aura::client::WINDOW_MOVE_SOURCE_MOUSE
           : aura::client::WINDOW_MOVE_SOURCE_TOUCH;
   handler->AttemptToStartDrag(cursor_location, HTCAPTION, aura_source, on_done);
 }
 
 void WindowManager::OnWmCancelMoveLoop(aura::Window* window) {
-  WmWindowMus* child_window = WmWindowMus::Get(window);
+  WmWindowAura* child_window = WmWindowAura::Get(window);
   MoveEventHandler* handler = MoveEventHandler::GetForWindow(child_window);
   if (handler)
     handler->RevertDrag();
 }
 
 ui::mojom::EventResult WindowManager::OnAccelerator(uint32_t id,
                                                     const ui::Event& event) {
   auto iter = accelerator_handlers_.find(GetAcceleratorNamespaceId(id));
   if (iter == accelerator_handlers_.end())
     return ui::mojom::EventResult::HANDLED;
 
   return iter->second->OnAccelerator(id, event);
 }
 
 void WindowManager::OnWmSetClientArea(
     aura::Window* window,
     const gfx::Insets& insets,
     const std::vector<gfx::Rect>& additional_client_areas) {
   NonClientFrameController* non_client_frame_controller =
       NonClientFrameController::Get(window);
   if (!non_client_frame_controller)
     return;
   non_client_frame_controller->SetClientArea(insets, additional_client_areas);
 }
 
-void WindowManager::OnWindowInitialized(aura::Window* window) {
-  // This ensures WmWindowAura won't be called before WmWindowMus. This is
-  // important as if WmWindowAura::Get() is called first, then WmWindowAura
-  // would be created, not WmWindowMus.
-  WmWindowMus::Get(window);
-}
-
 }  // namespace mus
 }  // namespace ash