chromeos: convert more ash/wm code to aura::Window

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>
 
@@ skipping 508 matching lines @@
   display_lock.reset();
   for (display::DisplayObserver& observer : *(display_list.observers()))
     observer.OnDisplayMetricsChanged(display, display_changed_values);
 }
 
 void WindowManager::OnWmPerformMoveLoop(
     aura::Window* window,
     ui::mojom::MoveLoopSource source,
     const gfx::Point& cursor_location,
     const base::Callback<void(bool)>& on_done) {
-  WmWindow* child_window = WmWindow::Get(window);
-  MoveEventHandler* handler = MoveEventHandler::GetForWindow(child_window);
+  MoveEventHandler* handler = MoveEventHandler::GetForWindow(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) {
-  WmWindow* child_window = WmWindow::Get(window);
-  MoveEventHandler* handler = MoveEventHandler::GetForWindow(child_window);
+  MoveEventHandler* handler = MoveEventHandler::GetForWindow(window);
   if (handler)
     handler->RevertDrag();
 }
 
 ui::mojom::EventResult WindowManager::OnAccelerator(
     uint32_t id,
     const ui::Event& event,
     std::unordered_map<std::string, std::vector<uint8_t>>* properties) {
   auto iter = accelerator_handlers_.find(GetAcceleratorNamespaceId(id));
   if (iter == accelerator_handlers_.end())
@@ skipping 16 matching lines @@
 bool WindowManager::IsWindowActive(aura::Window* window) {
   return Shell::Get()->activation_client()->GetActiveWindow() == window;
 }
 
 void WindowManager::OnWmDeactivateWindow(aura::Window* window) {
   Shell::Get()->activation_client()->DeactivateWindow(window);
 }
 
 }  // namespace mus
 }  // namespace ash