Promotes WmWindowMus functions to WmWindowAura and nukes WmWindowMus

ash/mus/root_window_controller.cc

 // Copyright 2016 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/root_window_controller.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <map>
 #include <sstream>
 #include <string>
 #include <utility>
 #include <vector>
 
+#include "ash/aura/wm_window_aura.h"
 #include "ash/common/shelf/shelf_layout_manager.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/wm/container_finder.h"
 #include "ash/common/wm/dock/docked_window_layout_manager.h"
 #include "ash/common/wm/panels/panel_layout_manager.h"
 #include "ash/common/wm/root_window_layout_manager.h"
 #include "ash/mus/bridge/wm_shell_mus.h"
-#include "ash/mus/bridge/wm_window_mus.h"
 #include "ash/mus/non_client_frame_controller.h"
 #include "ash/mus/property_util.h"
 #include "ash/mus/screen_mus.h"
 #include "ash/mus/window_manager.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_settings.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "mojo/public/cpp/bindings/type_converter.h"
@@ skipping 120 matching lines @@
   for (auto& property_pair : *properties) {
     property_converter->SetPropertyFromTransportValue(
         window, property_pair.first, &property_pair.second);
   }
   window->Init(ui::LAYER_TEXTURED);
   window->SetBounds(bounds);
 
   if (container_window) {
     container_window->AddChild(window);
   } else {
-    WmWindowMus* root = WmWindowMus::Get(this->root());
+    WmWindowAura* root = WmWindowAura::Get(this->root());
     gfx::Point origin =
         root->ConvertPointToTarget(root->GetRootWindow(), gfx::Point());
     origin += display_.bounds().OffsetFromOrigin();
     gfx::Rect bounds_in_screen(origin, bounds.size());
-    static_cast<WmWindowMus*>(
-        ash::wm::GetDefaultParent(WmWindowMus::Get(context),
-                                  WmWindowMus::Get(window), bounds_in_screen))
+    static_cast<WmWindowAura*>(
+        ash::wm::GetDefaultParent(WmWindowAura::Get(context),
+                                  WmWindowAura::Get(window), bounds_in_screen))
         ->aura_window()
         ->AddChild(window);
   }
   return window;
 }
 
-WmWindowMus* RootWindowController::GetWindowByShellWindowId(int id) {
-  return WmWindowMus::AsWmWindowMus(
-      WmWindowMus::Get(root())->GetChildByShellWindowId(id));
+ash::WmWindowAura* RootWindowController::GetWindowByShellWindowId(int id) {
+  return static_cast<WmWindowAura*>(
+      WmWindowAura::Get(root())->GetChildByShellWindowId(id));
 }
 
 void RootWindowController::SetWorkAreaInests(const gfx::Insets& insets) {
   gfx::Rect old_work_area = display_.work_area();
   display_.UpdateWorkAreaFromInsets(insets);
 
   if (old_work_area == display_.work_area())
     return;
 
   window_manager_->screen()->display_list().UpdateDisplay(display_);
@@ skipping 44 matching lines @@
   } else {
     width = root()->bounds().width() - 240;
     height = root()->bounds().height() - 240;
   }
   return gfx::Rect(40 + (window_count_ % 4) * 40, 40 + (window_count_ % 4) * 40,
                    width, height);
 }
 
 }  // namespace mus
 }  // namespace ash