Promotes WmWindowMus functions to WmWindowAura and nukes WmWindowMus

ash/mus/non_client_frame_controller.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/non_client_frame_controller.h"
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 #include <vector>
 
+#include "ash/aura/wm_window_aura.h"
 #include "ash/common/ash_constants.h"
 #include "ash/common/ash_layout_constants.h"
 #include "ash/common/frame/custom_frame_view_ash.h"
 #include "ash/common/wm/panels/panel_frame_view.h"
-#include "ash/mus/bridge/wm_window_mus.h"
 #include "ash/mus/frame/custom_frame_view_mus.h"
 #include "ash/mus/frame/detached_title_area_renderer.h"
 #include "ash/mus/move_event_handler.h"
 #include "ash/mus/property_util.h"
 #include "ash/mus/shadow.h"
 #include "ash/mus/window_manager.h"
 #include "ash/mus/window_properties.h"
 #include "ash/shared/immersive_fullscreen_controller_delegate.h"
 #include "ash/wm/window_properties.h"
 #include "base/macros.h"
@@ skipping 86 matching lines @@
     // Clip the bounds of the title area to that of the |frame_window_|.
     gfx::Rect visible_bounds = title_area_window->bounds();
     visible_bounds.Intersect(frame_window_->bounds());
     // The intersection is in the coordinates of |title_area_window|'s parent,
     // convert to be in |title_area_window| and then to screen.
     visible_bounds -= title_area_window->bounds().origin().OffsetFromOrigin();
     // TODO: this needs updating when parent of |title_area_window| is changed,
     // DCHECK is to ensure when parent changes this code is updated.
     // http://crbug.com/640392.
     DCHECK_EQ(frame_window_->parent(), title_area_window->parent());
-    result.push_back(WmWindowMus::Get(title_area_window)
+    result.push_back(ash::WmWindowAura::Get(title_area_window)
                          ->ConvertRectToScreen(visible_bounds));
     return result;
   }
 
   // DetachedTitleAreaRendererHost:
   void OnDetachedTitleAreaRendererDestroyed(
       DetachedTitleAreaRenderer* renderer) override {
     title_area_renderer_ = nullptr;
   }
 
@@ skipping 188 matching lines @@
   // NativeWidgetAura resets the show state from |params|, so we need to update
   // |params|.
   params.show_state = window_->GetProperty(aura::client::kShowStateKey);
   widget_->Init(params);
   did_init_native_widget_ = true;
 
   widget_->ShowInactive();
 
   const int shadow_inset =
       Shadow::GetInteriorInsetForStyle(Shadow::STYLE_ACTIVE);
-  WmWindowMus* wm_window = WmWindowMus::Get(window_);
+  ash::WmWindowAura* wm_window = ash::WmWindowAura::Get(window_);
   const gfx::Insets extended_hit_region =
       wm_window->ShouldUseExtendedHitRegion() ? GetExtendedHitRegion()
                                               : gfx::Insets();
   window_manager_client_->SetUnderlaySurfaceOffsetAndExtendedHitArea(
       window_, gfx::Vector2d(shadow_inset, shadow_inset), extended_hit_region);
 }
 
 // static
 NonClientFrameController* NonClientFrameController::Get(aura::Window* window) {
   return window->GetProperty(kNonClientFrameControllerKey);
@@ skipping 43 matching lines @@
 
   base::string16 title = *window_->GetProperty(aura::client::kTitleKey);
 
   if (window_->GetProperty(kWindowIsJanky))
     title += base::ASCIIToUTF16(" !! Not responding !!");
 
   return title;
 }
 
 bool NonClientFrameController::CanResize() const {
-  return window_ && WmWindowMus::Get(window_)->CanResize();
+  return window_ && ash::WmWindowAura::Get(window_)->CanResize();
 }
 
 bool NonClientFrameController::CanMaximize() const {
-  return window_ && WmWindowMus::Get(window_)->CanMaximize();
+  return window_ && ash::WmWindowAura::Get(window_)->CanMaximize();
 }
 
 bool NonClientFrameController::CanMinimize() const {
-  return window_ && WmWindowMus::Get(window_)->CanMinimize();
+  return window_ && ash::WmWindowAura::Get(window_)->CanMinimize();
 }
 
 bool NonClientFrameController::ShouldShowWindowTitle() const {
   // Only draw the title if the client hasn't declared any additional client
   // areas which might conflict with it.
   return window_ && additional_client_areas_.empty();
 }
 
 views::ClientView* NonClientFrameController::CreateClientView(
     views::Widget* widget) {
@@ skipping 34 matching lines @@
   }
 }
 
 void NonClientFrameController::OnWindowDestroyed(aura::Window* window) {
   window_->RemoveObserver(this);
   window_ = nullptr;
 }
 
 }  // namespace mus
 }  // namespace ash