chromeos: Renames WmWindowAura to WmWindow

ash/common/wm_window.cc

Index: ash/common/wm_window.cc
diff --git a/ash/aura/wm_window_aura.cc b/ash/common/wm_window.cc
similarity index 69%
rename from ash/aura/wm_window_aura.cc
rename to ash/common/wm_window.cc
index 0b23a4b84b0d7f544ee18c8025302120d9482b26..05b781bcc3cb2385b82e2d7edfd01b85901a890b 100644
--- a/ash/aura/wm_window_aura.cc
+++ b/ash/common/wm_window.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/aura/wm_window_aura.h"
+#include "ash/common/wm_window.h"
 
 #include "ash/aura/aura_layout_manager_adapter.h"
 #include "ash/aura/wm_shell_aura.h"
@@ -50,11 +50,11 @@
 #include "ui/wm/core/visibility_controller.h"
 #include "ui/wm/core/window_util.h"
 
-DECLARE_WINDOW_PROPERTY_TYPE(ash::WmWindowAura*);
+DECLARE_WINDOW_PROPERTY_TYPE(ash::WmWindow*);
 
 namespace ash {
 
-DEFINE_OWNED_WINDOW_PROPERTY_KEY(WmWindowAura, kWmWindowKey, nullptr);
+DEFINE_OWNED_WINDOW_PROPERTY_KEY(WmWindow, kWmWindowKey, nullptr);
 
 static_assert(aura::Window::kInitialId == kShellWindowId_Invalid,
               "ids must match");
@@ -90,9 +90,9 @@ class BoundsSetter : public aura::LayoutManager {
 }  // namespace
 
 // static
-bool WmWindowAura::default_use_empty_minimum_size_for_testing_ = false;
+bool WmWindow::default_use_empty_minimum_size_for_testing_ = false;
 
-WmWindowAura::~WmWindowAura() {
+WmWindow::~WmWindow() {
   if (added_transient_observer_)
     ::wm::TransientWindowManager::Get(window_)->RemoveObserver(this);
 
@@ -100,20 +100,20 @@ WmWindowAura::~WmWindowAura() {
 }
 
 // static
-const WmWindowAura* WmWindowAura::Get(const aura::Window* window) {
+const WmWindow* WmWindow::Get(const aura::Window* window) {
   if (!window)
     return nullptr;
 
-  const WmWindowAura* wm_window = window->GetProperty(kWmWindowKey);
+  const WmWindow* wm_window = window->GetProperty(kWmWindowKey);
   if (wm_window)
     return wm_window;
-  // WmWindowAura is owned by the aura::Window.
+  // WmWindow is owned by the aura::Window.
   // TODO(sky): fix constness.
-  return new WmWindowAura(const_cast<aura::Window*>(window));
+  return new WmWindow(const_cast<aura::Window*>(window));
 }
 
 // static
-std::vector<WmWindow*> WmWindowAura::FromAuraWindows(
+std::vector<WmWindow*> WmWindow::FromAuraWindows(
     const std::vector<aura::Window*>& aura_windows) {
   std::vector<WmWindow*> result(aura_windows.size());
   for (size_t i = 0; i < aura_windows.size(); ++i)
@@ -122,178 +122,178 @@ std::vector<WmWindow*> WmWindowAura::FromAuraWindows(
 }
 
 // static
-std::vector<aura::Window*> WmWindowAura::ToAuraWindows(
+std::vector<aura::Window*> WmWindow::ToAuraWindows(
     const std::vector<WmWindow*>& windows) {
   std::vector<aura::Window*> result(windows.size());
   for (size_t i = 0; i < windows.size(); ++i)
-    result[i] = WmWindowAura::GetAuraWindow(windows[i]);
+    result[i] = WmWindow::GetAuraWindow(windows[i]);
   return result;
 }
 
 // static
-const aura::Window* WmWindowAura::GetAuraWindow(const WmWindow* wm_window) {
-  return wm_window ? static_cast<const WmWindowAura*>(wm_window)->aura_window()
+const aura::Window* WmWindow::GetAuraWindow(const WmWindow* wm_window) {
+  return wm_window ? static_cast<const WmWindow*>(wm_window)->aura_window()
                    : nullptr;
 }
 
-bool WmWindowAura::ShouldUseExtendedHitRegion() const {
+bool WmWindow::ShouldUseExtendedHitRegion() const {
   const WmWindow* parent = Get(window_->parent());
   return parent &&
-         static_cast<const WmWindowAura*>(parent)
+         static_cast<const WmWindow*>(parent)
              ->children_use_extended_hit_region_;
 }
 
-void WmWindowAura::Destroy() {
+void WmWindow::Destroy() {
   delete window_;
   // WARNING: this has been deleted.
 }
 
-const WmWindow* WmWindowAura::GetRootWindow() const {
+const WmWindow* WmWindow::GetRootWindow() const {
   return Get(window_->GetRootWindow());
 }
 
-RootWindowController* WmWindowAura::GetRootWindowController() {
+RootWindowController* WmWindow::GetRootWindowController() {
   aura::Window* root = window_->GetRootWindow();
   return root ? RootWindowController::ForWindow(root) : nullptr;
 }
 
-WmShell* WmWindowAura::GetShell() const {
+WmShell* WmWindow::GetShell() const {
   return WmShell::Get();
 }
 
-void WmWindowAura::SetName(const char* name) {
+void WmWindow::SetName(const char* name) {
   window_->SetName(name);
 }
 
-std::string WmWindowAura::GetName() const {
+std::string WmWindow::GetName() const {
   return window_->GetName();
 }
 
-void WmWindowAura::SetTitle(const base::string16& title) {
+void WmWindow::SetTitle(const base::string16& title) {
   window_->SetTitle(title);
 }
 
-base::string16 WmWindowAura::GetTitle() const {
+base::string16 WmWindow::GetTitle() const {
   return window_->GetTitle();
 }
 
-void WmWindowAura::SetShellWindowId(int id) {
+void WmWindow::SetShellWindowId(int id) {
   window_->set_id(id);
 }
 
-int WmWindowAura::GetShellWindowId() const {
+int WmWindow::GetShellWindowId() const {
   return window_->id();
 }
 
-ui::wm::WindowType WmWindowAura::GetType() const {
+ui::wm::WindowType WmWindow::GetType() const {
   return window_->type();
 }
 
-int WmWindowAura::GetAppType() const {
+int WmWindow::GetAppType() const {
   return window_->GetProperty(aura::client::kAppType);
 }
 
-void WmWindowAura::SetAppType(int app_type) const {
+void WmWindow::SetAppType(int app_type) const {
   window_->SetProperty(aura::client::kAppType, app_type);
 }
 
-ui::Layer* WmWindowAura::GetLayer() {
+ui::Layer* WmWindow::GetLayer() {
   return window_->layer();
 }
 
-bool WmWindowAura::GetLayerTargetVisibility() {
+bool WmWindow::GetLayerTargetVisibility() {
   return GetLayer()->GetTargetVisibility();
 }
 
-bool WmWindowAura::GetLayerVisible() {
+bool WmWindow::GetLayerVisible() {
   return GetLayer()->visible();
 }
 
-display::Display WmWindowAura::GetDisplayNearestWindow() {
+display::Display WmWindow::GetDisplayNearestWindow() {
   return display::Screen::GetScreen()->GetDisplayNearestWindow(window_);
 }
 
-bool WmWindowAura::HasNonClientArea() {
+bool WmWindow::HasNonClientArea() {
   return window_->delegate() ? true : false;
 }
 
-int WmWindowAura::GetNonClientComponent(const gfx::Point& location) {
+int WmWindow::GetNonClientComponent(const gfx::Point& location) {
   return window_->delegate()
              ? window_->delegate()->GetNonClientComponent(location)
              : HTNOWHERE;
 }
 
-gfx::Point WmWindowAura::ConvertPointToTarget(const WmWindow* target,
-                                              const gfx::Point& point) const {
+gfx::Point WmWindow::ConvertPointToTarget(const WmWindow* target,
+                                          const gfx::Point& point) const {
   gfx::Point result(point);
   aura::Window::ConvertPointToTarget(window_, GetAuraWindow(target), &result);
   return result;
 }
 
-gfx::Point WmWindowAura::ConvertPointToScreen(const gfx::Point& point) const {
+gfx::Point WmWindow::ConvertPointToScreen(const gfx::Point& point) const {
   gfx::Point result(point);
   ::wm::ConvertPointToScreen(window_, &result);
   return result;
 }
 
-gfx::Point WmWindowAura::ConvertPointFromScreen(const gfx::Point& point) const {
+gfx::Point WmWindow::ConvertPointFromScreen(const gfx::Point& point) const {
   gfx::Point result(point);
   ::wm::ConvertPointFromScreen(window_, &result);
   return result;
 }
 
-gfx::Rect WmWindowAura::ConvertRectToScreen(const gfx::Rect& rect) const {
+gfx::Rect WmWindow::ConvertRectToScreen(const gfx::Rect& rect) const {
   return ScreenUtil::ConvertRectToScreen(window_, rect);
 }
 
-gfx::Rect WmWindowAura::ConvertRectFromScreen(const gfx::Rect& rect) const {
+gfx::Rect WmWindow::ConvertRectFromScreen(const gfx::Rect& rect) const {
   return ScreenUtil::ConvertRectFromScreen(window_, rect);
 }
 
-gfx::Size WmWindowAura::GetMinimumSize() const {
+gfx::Size WmWindow::GetMinimumSize() const {
   return window_->delegate() && !use_empty_minimum_size_for_testing_
              ? window_->delegate()->GetMinimumSize()
              : gfx::Size();
 }
 
-gfx::Size WmWindowAura::GetMaximumSize() const {
+gfx::Size WmWindow::GetMaximumSize() const {
   return window_->delegate() ? window_->delegate()->GetMaximumSize()
                              : gfx::Size();
 }
 
-bool WmWindowAura::GetTargetVisibility() const {
+bool WmWindow::GetTargetVisibility() const {
   return window_->TargetVisibility();
 }
 
-bool WmWindowAura::IsVisible() const {
+bool WmWindow::IsVisible() const {
   return window_->IsVisible();
 }
 
-void WmWindowAura::SetOpacity(float opacity) {
+void WmWindow::SetOpacity(float opacity) {
   window_->layer()->SetOpacity(opacity);
 }
 
-float WmWindowAura::GetTargetOpacity() const {
+float WmWindow::GetTargetOpacity() const {
   return window_->layer()->GetTargetOpacity();
 }
 
-gfx::Rect WmWindowAura::GetMinimizeAnimationTargetBoundsInScreen() const {
+gfx::Rect WmWindow::GetMinimizeAnimationTargetBoundsInScreen() const {
   return ash::GetMinimizeAnimationTargetBoundsInScreen(window_);
 }
 
-void WmWindowAura::SetTransform(const gfx::Transform& transform) {
+void WmWindow::SetTransform(const gfx::Transform& transform) {
   window_->SetTransform(transform);
 }
 
-gfx::Transform WmWindowAura::GetTargetTransform() const {
+gfx::Transform WmWindow::GetTargetTransform() const {
   return window_->layer()->GetTargetTransform();
 }
 
-bool WmWindowAura::IsSystemModal() const {
+bool WmWindow::IsSystemModal() const {
   return window_->GetProperty(aura::client::kModalKey) == ui::MODAL_TYPE_SYSTEM;
 }
 
-bool WmWindowAura::GetBoolProperty(WmWindowProperty key) {
+bool WmWindow::GetBoolProperty(WmWindowProperty key) {
   switch (key) {
     case WmWindowProperty::DRAW_ATTENTION:
       return window_->GetProperty(aura::client::kDrawAttentionKey);
@@ -315,7 +315,7 @@ bool WmWindowAura::GetBoolProperty(WmWindowProperty key) {
   return false;
 }
 
-void WmWindowAura::SetBoolProperty(WmWindowProperty key, bool value) {
+void WmWindow::SetBoolProperty(WmWindowProperty key, bool value) {
   switch (key) {
     case WmWindowProperty::PANEL_ATTACHED:
       window_->SetProperty(kPanelAttachedKey, value);
@@ -326,7 +326,7 @@ void WmWindowAura::SetBoolProperty(WmWindowProperty key, bool value) {
   }
 }
 
-SkColor WmWindowAura::GetColorProperty(WmWindowProperty key) {
+SkColor WmWindow::GetColorProperty(WmWindowProperty key) {
   if (key == WmWindowProperty::TOP_VIEW_COLOR)
     return window_->GetProperty(aura::client::kTopViewColor);
 
@@ -334,7 +334,7 @@ SkColor WmWindowAura::GetColorProperty(WmWindowProperty key) {
   return 0;
 }
 
-void WmWindowAura::SetColorProperty(WmWindowProperty key, SkColor value) {
+void WmWindow::SetColorProperty(WmWindowProperty key, SkColor value) {
   if (key == WmWindowProperty::TOP_VIEW_COLOR) {
     window_->SetProperty(aura::client::kTopViewColor, value);
     return;
@@ -343,7 +343,7 @@ void WmWindowAura::SetColorProperty(WmWindowProperty key, SkColor value) {
   NOTREACHED();
 }
 
-int WmWindowAura::GetIntProperty(WmWindowProperty key) {
+int WmWindow::GetIntProperty(WmWindowProperty key) {
   if (key == WmWindowProperty::MODAL_TYPE)
     return window_->GetProperty(aura::client::kModalKey);
 
@@ -366,7 +366,7 @@ int WmWindowAura::GetIntProperty(WmWindowProperty key) {
   return 0;
 }
 
-void WmWindowAura::SetIntProperty(WmWindowProperty key, int value) {
+void WmWindow::SetIntProperty(WmWindowProperty key, int value) {
   if (key == WmWindowProperty::SHELF_ID) {
     window_->SetProperty(kShelfIDKey, value);
     return;
@@ -383,7 +383,7 @@ void WmWindowAura::SetIntProperty(WmWindowProperty key, int value) {
   NOTREACHED();
 }
 
-std::string WmWindowAura::GetStringProperty(WmWindowProperty key) {
+std::string WmWindow::GetStringProperty(WmWindowProperty key) {
   if (key == WmWindowProperty::APP_ID) {
     std::string* value = window_->GetProperty(aura::client::kAppIdKey);
     return value ? *value : std::string();
@@ -393,8 +393,8 @@ std::string WmWindowAura::GetStringProperty(WmWindowProperty key) {
   return std::string();
 }
 
-void WmWindowAura::SetStringProperty(WmWindowProperty key,
-                                     const std::string& value) {
+void WmWindow::SetStringProperty(WmWindowProperty key,
+                                 const std::string& value) {
   if (key == WmWindowProperty::APP_ID) {
     window_->SetProperty(aura::client::kAppIdKey, new std::string(value));
     return;
@@ -403,59 +403,59 @@ void WmWindowAura::SetStringProperty(WmWindowProperty key,
   NOTREACHED();
 }
 
-gfx::ImageSkia WmWindowAura::GetWindowIcon() {
+gfx::ImageSkia WmWindow::GetWindowIcon() {
   gfx::ImageSkia* image = window_->GetProperty(aura::client::kWindowIconKey);
   return image ? *image : gfx::ImageSkia();
 }
 
-gfx::ImageSkia WmWindowAura::GetAppIcon() {
+gfx::ImageSkia WmWindow::GetAppIcon() {
   gfx::ImageSkia* image = window_->GetProperty(aura::client::kAppIconKey);
   return image ? *image : gfx::ImageSkia();
 }
 
-const wm::WindowState* WmWindowAura::GetWindowState() const {
+const wm::WindowState* WmWindow::GetWindowState() const {
   return ash::wm::GetWindowState(window_);
 }
 
-WmWindow* WmWindowAura::GetToplevelWindow() {
+WmWindow* WmWindow::GetToplevelWindow() {
   return Get(window_->GetToplevelWindow());
 }
 
-WmWindow* WmWindowAura::GetToplevelWindowForFocus() {
+WmWindow* WmWindow::GetToplevelWindowForFocus() {
   return Get(::wm::GetToplevelWindow(window_));
 }
 
-void WmWindowAura::SetParentUsingContext(WmWindow* context,
-                                         const gfx::Rect& screen_bounds) {
+void WmWindow::SetParentUsingContext(WmWindow* context,
+                                     const gfx::Rect& screen_bounds) {
   aura::client::ParentWindowWithContext(window_, GetAuraWindow(context),
                                         screen_bounds);
 }
 
-void WmWindowAura::AddChild(WmWindow* window) {
+void WmWindow::AddChild(WmWindow* window) {
   window_->AddChild(GetAuraWindow(window));
 }
 
-void WmWindowAura::RemoveChild(WmWindow* child) {
+void WmWindow::RemoveChild(WmWindow* child) {
   window_->RemoveChild(GetAuraWindow(child));
 }
 
-const WmWindow* WmWindowAura::GetParent() const {
+const WmWindow* WmWindow::GetParent() const {
   return Get(window_->parent());
 }
 
-const WmWindow* WmWindowAura::GetTransientParent() const {
+const WmWindow* WmWindow::GetTransientParent() const {
   return Get(::wm::GetTransientParent(window_));
 }
 
-std::vector<WmWindow*> WmWindowAura::GetTransientChildren() {
+std::vector<WmWindow*> WmWindow::GetTransientChildren() {
   return FromAuraWindows(::wm::GetTransientChildren(window_));
 }
 
-bool WmWindowAura::MoveToEventRoot(const ui::Event& event) {
+bool WmWindow::MoveToEventRoot(const ui::Event& event) {
   return ash::wm::MoveWindowToEventRoot(window_, event);
 }
 
-void WmWindowAura::SetLayoutManager(
+void WmWindow::SetLayoutManager(
     std::unique_ptr<WmLayoutManager> layout_manager) {
   // See ~AuraLayoutManagerAdapter for why SetLayoutManager(nullptr) is called.
   window_->SetLayoutManager(nullptr);
@@ -467,51 +467,51 @@ void WmWindowAura::SetLayoutManager(
       new AuraLayoutManagerAdapter(window_, std::move(layout_manager)));
 }
 
-WmLayoutManager* WmWindowAura::GetLayoutManager() {
+WmLayoutManager* WmWindow::GetLayoutManager() {
   AuraLayoutManagerAdapter* adapter = AuraLayoutManagerAdapter::Get(window_);
   return adapter ? adapter->wm_layout_manager() : nullptr;
 }
 
-void WmWindowAura::SetVisibilityChangesAnimated() {
+void WmWindow::SetVisibilityChangesAnimated() {
   ::wm::SetWindowVisibilityChangesAnimated(window_);
 }
 
-void WmWindowAura::SetVisibilityAnimationType(int type) {
+void WmWindow::SetVisibilityAnimationType(int type) {
   ::wm::SetWindowVisibilityAnimationType(window_, type);
 }
 
-void WmWindowAura::SetVisibilityAnimationDuration(base::TimeDelta delta) {
+void WmWindow::SetVisibilityAnimationDuration(base::TimeDelta delta) {
   ::wm::SetWindowVisibilityAnimationDuration(window_, delta);
 }
 
-void WmWindowAura::SetVisibilityAnimationTransition(
+void WmWindow::SetVisibilityAnimationTransition(
     ::wm::WindowVisibilityAnimationTransition transition) {
   ::wm::SetWindowVisibilityAnimationTransition(window_, transition);
 }
 
-void WmWindowAura::Animate(::wm::WindowAnimationType type) {
+void WmWindow::Animate(::wm::WindowAnimationType type) {
   ::wm::AnimateWindow(window_, type);
 }
 
-void WmWindowAura::StopAnimatingProperty(
+void WmWindow::StopAnimatingProperty(
     ui::LayerAnimationElement::AnimatableProperty property) {
   window_->layer()->GetAnimator()->StopAnimatingProperty(property);
 }
 
-void WmWindowAura::SetChildWindowVisibilityChangesAnimated() {
+void WmWindow::SetChildWindowVisibilityChangesAnimated() {
   ::wm::SetChildWindowVisibilityChangesAnimated(window_);
 }
 
-void WmWindowAura::SetMasksToBounds(bool value) {
+void WmWindow::SetMasksToBounds(bool value) {
   window_->layer()->SetMasksToBounds(value);
 }
 
-void WmWindowAura::SetBounds(const gfx::Rect& bounds) {
+void WmWindow::SetBounds(const gfx::Rect& bounds) {
   window_->SetBounds(bounds);
 }
 
-void WmWindowAura::SetBoundsWithTransitionDelay(const gfx::Rect& bounds,
-                                                base::TimeDelta delta) {
+void WmWindow::SetBoundsWithTransitionDelay(const gfx::Rect& bounds,
+                                            base::TimeDelta delta) {
   if (::wm::WindowAnimationsDisabled(window_)) {
     window_->SetBounds(bounds);
     return;
@@ -522,12 +522,12 @@ void WmWindowAura::SetBoundsWithTransitionDelay(const gfx::Rect& bounds,
   window_->SetBounds(bounds);
 }
 
-void WmWindowAura::SetBoundsDirect(const gfx::Rect& bounds) {
+void WmWindow::SetBoundsDirect(const gfx::Rect& bounds) {
   BoundsSetter().SetBounds(window_, bounds);
   wm::SnapWindowToPixelBoundary(window_);
 }
 
-void WmWindowAura::SetBoundsDirectAnimated(const gfx::Rect& bounds) {
+void WmWindow::SetBoundsDirectAnimated(const gfx::Rect& bounds) {
   const int kBoundsChangeSlideDurationMs = 120;
 
   ui::Layer* layer = window_->layer();
@@ -539,7 +539,7 @@ void WmWindowAura::SetBoundsDirectAnimated(const gfx::Rect& bounds) {
   SetBoundsDirect(bounds);
 }
 
-void WmWindowAura::SetBoundsDirectCrossFade(const gfx::Rect& bounds) {
+void WmWindow::SetBoundsDirectCrossFade(const gfx::Rect& bounds) {
   const gfx::Rect old_bounds = window_->bounds();
 
   // Create fresh layers for the window and all its children to paint into.
@@ -566,58 +566,55 @@ void WmWindowAura::SetBoundsDirectCrossFade(const gfx::Rect& bounds) {
   CrossFadeAnimation(window_, std::move(old_layer_owner), gfx::Tween::EASE_OUT);
 }
 
-void WmWindowAura::SetBoundsInScreen(const gfx::Rect& bounds_in_screen,
-                                     const display::Display& dst_display) {
+void WmWindow::SetBoundsInScreen(const gfx::Rect& bounds_in_screen,
+                                 const display::Display& dst_display) {
   window_->SetBoundsInScreen(bounds_in_screen, dst_display);
 }
 
-gfx::Rect WmWindowAura::GetBoundsInScreen() const {
+gfx::Rect WmWindow::GetBoundsInScreen() const {
   return window_->GetBoundsInScreen();
 }
 
-const gfx::Rect& WmWindowAura::GetBounds() const {
+const gfx::Rect& WmWindow::GetBounds() const {
   return window_->bounds();
 }
 
-gfx::Rect WmWindowAura::GetTargetBounds() {
+gfx::Rect WmWindow::GetTargetBounds() {
   return window_->GetTargetBounds();
 }
 
-void WmWindowAura::ClearRestoreBounds() {
+void WmWindow::ClearRestoreBounds() {
   window_->ClearProperty(aura::client::kRestoreBoundsKey);
 }
 
-void WmWindowAura::SetRestoreBoundsInScreen(const gfx::Rect& bounds) {
+void WmWindow::SetRestoreBoundsInScreen(const gfx::Rect& bounds) {
   window_->SetProperty(aura::client::kRestoreBoundsKey, new gfx::Rect(bounds));
 }
 
-gfx::Rect WmWindowAura::GetRestoreBoundsInScreen() const {
+gfx::Rect WmWindow::GetRestoreBoundsInScreen() const {
   gfx::Rect* bounds = window_->GetProperty(aura::client::kRestoreBoundsKey);
   return bounds ? *bounds : gfx::Rect();
 }
 
-bool WmWindowAura::Contains(const WmWindow* other) const {
-  return other
-             ? window_->Contains(
-                   static_cast<const WmWindowAura*>(other)->window_)
-             : false;
+bool WmWindow::Contains(const WmWindow* other) const {
+  return other ? window_->Contains(static_cast<const WmWindow*>(other)->window_)
+               : false;
 }
 
-void WmWindowAura::SetShowState(ui::WindowShowState show_state) {
+void WmWindow::SetShowState(ui::WindowShowState show_state) {
   window_->SetProperty(aura::client::kShowStateKey, show_state);
 }
 
-ui::WindowShowState WmWindowAura::GetShowState() const {
+ui::WindowShowState WmWindow::GetShowState() const {
   return window_->GetProperty(aura::client::kShowStateKey);
 }
 
-void WmWindowAura::SetRestoreShowState(ui::WindowShowState show_state) {
+void WmWindow::SetRestoreShowState(ui::WindowShowState show_state) {
   window_->SetProperty(aura::client::kRestoreShowStateKey, show_state);
 }
 
-void WmWindowAura::SetRestoreOverrides(
-    const gfx::Rect& bounds_override,
-    ui::WindowShowState window_state_override) {
+void WmWindow::SetRestoreOverrides(const gfx::Rect& bounds_override,
+                                   ui::WindowShowState window_state_override) {
   if (bounds_override.IsEmpty()) {
     window_->ClearProperty(kRestoreShowStateOverrideKey);
     window_->ClearProperty(kRestoreBoundsOverrideKey);
@@ -628,68 +625,68 @@ void WmWindowAura::SetRestoreOverrides(
                        new gfx::Rect(bounds_override));
 }
 
-void WmWindowAura::SetLockedToRoot(bool value) {
+void WmWindow::SetLockedToRoot(bool value) {
   window_->SetProperty(kLockedToRootKey, value);
 }
 
-bool WmWindowAura::IsLockedToRoot() const {
+bool WmWindow::IsLockedToRoot() const {
   return window_->GetProperty(kLockedToRootKey);
 }
 
-void WmWindowAura::SetCapture() {
+void WmWindow::SetCapture() {
   window_->SetCapture();
 }
 
-bool WmWindowAura::HasCapture() {
+bool WmWindow::HasCapture() {
   return window_->HasCapture();
 }
 
-void WmWindowAura::ReleaseCapture() {
+void WmWindow::ReleaseCapture() {
   window_->ReleaseCapture();
 }
 
-bool WmWindowAura::HasRestoreBounds() const {
+bool WmWindow::HasRestoreBounds() const {
   return window_->GetProperty(aura::client::kRestoreBoundsKey) != nullptr;
 }
 
-bool WmWindowAura::CanMaximize() const {
+bool WmWindow::CanMaximize() const {
   return (window_->GetProperty(aura::client::kResizeBehaviorKey) &
           ui::mojom::kResizeBehaviorCanMaximize) != 0;
 }
 
-bool WmWindowAura::CanMinimize() const {
+bool WmWindow::CanMinimize() const {
   return (window_->GetProperty(aura::client::kResizeBehaviorKey) &
           ui::mojom::kResizeBehaviorCanMinimize) != 0;
 }
 
-bool WmWindowAura::CanResize() const {
+bool WmWindow::CanResize() const {
   return (window_->GetProperty(aura::client::kResizeBehaviorKey) &
           ui::mojom::kResizeBehaviorCanResize) != 0;
 }
 
-bool WmWindowAura::CanActivate() const {
+bool WmWindow::CanActivate() const {
   // TODO(sky): for aura-mus need to key off CanFocus() as well, which is not
   // currently mirrored to ash.
   return ::wm::CanActivateWindow(window_);
 }
 
-void WmWindowAura::StackChildAtTop(WmWindow* child) {
+void WmWindow::StackChildAtTop(WmWindow* child) {
   window_->StackChildAtTop(GetAuraWindow(child));
 }
 
-void WmWindowAura::StackChildAtBottom(WmWindow* child) {
+void WmWindow::StackChildAtBottom(WmWindow* child) {
   window_->StackChildAtBottom(GetAuraWindow(child));
 }
 
-void WmWindowAura::StackChildAbove(WmWindow* child, WmWindow* target) {
+void WmWindow::StackChildAbove(WmWindow* child, WmWindow* target) {
   window_->StackChildAbove(GetAuraWindow(child), GetAuraWindow(target));
 }
 
-void WmWindowAura::StackChildBelow(WmWindow* child, WmWindow* target) {
+void WmWindow::StackChildBelow(WmWindow* child, WmWindow* target) {
   window_->StackChildBelow(GetAuraWindow(child), GetAuraWindow(target));
 }
 
-void WmWindowAura::SetPinned(bool trusted) {
+void WmWindow::SetPinned(bool trusted) {
   if (aura::Env::GetInstance()->mode() == aura::Env::Mode::MUS) {
     // TODO: fix, see http://crbug.com/622486. With aura-mus pinning may just
     // work.
@@ -699,30 +696,30 @@ void WmWindowAura::SetPinned(bool trusted) {
   wm::PinWindow(window_, trusted);
 }
 
-void WmWindowAura::SetAlwaysOnTop(bool value) {
+void WmWindow::SetAlwaysOnTop(bool value) {
   window_->SetProperty(aura::client::kAlwaysOnTopKey, value);
 }
 
-bool WmWindowAura::IsAlwaysOnTop() const {
+bool WmWindow::IsAlwaysOnTop() const {
   return window_->GetProperty(aura::client::kAlwaysOnTopKey);
 }
 
-void WmWindowAura::Hide() {
+void WmWindow::Hide() {
   window_->Hide();
 }
 
-void WmWindowAura::Show() {
+void WmWindow::Show() {
   window_->Show();
 }
 
-views::Widget* WmWindowAura::GetInternalWidget() {
+views::Widget* WmWindow::GetInternalWidget() {
   return window_->GetProperty(kWidgetCreationTypeKey) ==
                  WidgetCreationType::INTERNAL
              ? views::Widget::GetWidgetForNativeView(window_)
              : nullptr;
 }
 
-void WmWindowAura::CloseWidget() {
+void WmWindow::CloseWidget() {
   if (aura::Env::GetInstance()->mode() == aura::Env::Mode::MUS &&
       aura_window()->GetProperty(kWidgetCreationTypeKey) ==
           WidgetCreationType::FOR_CLIENT) {
@@ -737,54 +734,54 @@ void WmWindowAura::CloseWidget() {
   GetInternalWidget()->Close();
 }
 
-void WmWindowAura::SetFocused() {
+void WmWindow::SetFocused() {
   aura::client::GetFocusClient(window_)->FocusWindow(window_);
 }
 
-bool WmWindowAura::IsFocused() const {
+bool WmWindow::IsFocused() const {
   return window_->HasFocus();
 }
 
-bool WmWindowAura::IsActive() const {
+bool WmWindow::IsActive() const {
   return wm::IsActiveWindow(window_);
 }
 
-void WmWindowAura::Activate() {
+void WmWindow::Activate() {
   wm::ActivateWindow(window_);
 }
 
-void WmWindowAura::Deactivate() {
+void WmWindow::Deactivate() {
   wm::DeactivateWindow(window_);
 }
 
-void WmWindowAura::SetFullscreen() {
+void WmWindow::SetFullscreen() {
   window_->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_FULLSCREEN);
 }
 
-void WmWindowAura::Maximize() {
+void WmWindow::Maximize() {
   window_->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MAXIMIZED);
 }
 
-void WmWindowAura::Minimize() {
+void WmWindow::Minimize() {
   window_->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MINIMIZED);
 }
 
-void WmWindowAura::Unminimize() {
+void WmWindow::Unminimize() {
   window_->SetProperty(
       aura::client::kShowStateKey,
       window_->GetProperty(aura::client::kRestoreShowStateKey));
   window_->ClearProperty(aura::client::kRestoreShowStateKey);
 }
 
-std::vector<WmWindow*> WmWindowAura::GetChildren() {
+std::vector<WmWindow*> WmWindow::GetChildren() {
   return FromAuraWindows(window_->children());
 }
 
-WmWindow* WmWindowAura::GetChildByShellWindowId(int id) {
+WmWindow* WmWindow::GetChildByShellWindowId(int id) {
   return Get(window_->GetChildById(id));
 }
 
-void WmWindowAura::ShowResizeShadow(int component) {
+void WmWindow::ShowResizeShadow(int component) {
   if (aura::Env::GetInstance()->mode() == aura::Env::Mode::MUS) {
     // TODO: http://crbug.com/640773.
     return;
@@ -795,7 +792,7 @@ void WmWindowAura::ShowResizeShadow(int component) {
     resize_shadow_controller->ShowShadow(window_, component);
 }
 
-void WmWindowAura::HideResizeShadow() {
+void WmWindow::HideResizeShadow() {
   if (aura::Env::GetInstance()->mode() == aura::Env::Mode::MUS) {
     // TODO: http://crbug.com/640773.
     return;
@@ -806,28 +803,28 @@ void WmWindowAura::HideResizeShadow() {
     resize_shadow_controller->HideShadow(window_);
 }
 
-void WmWindowAura::InstallResizeHandleWindowTargeter(
+void WmWindow::InstallResizeHandleWindowTargeter(
     ImmersiveFullscreenController* immersive_fullscreen_controller) {
   window_->SetEventTargeter(base::MakeUnique<ResizeHandleWindowTargeter>(
       window_, immersive_fullscreen_controller));
 }
 
-void WmWindowAura::SetBoundsInScreenBehaviorForChildren(
+void WmWindow::SetBoundsInScreenBehaviorForChildren(
     BoundsInScreenBehavior behavior) {
   window_->SetProperty(
       kUsesScreenCoordinatesKey,
       behavior == BoundsInScreenBehavior::USE_SCREEN_COORDINATES);
 }
 
-void WmWindowAura::SetSnapsChildrenToPhysicalPixelBoundary() {
+void WmWindow::SetSnapsChildrenToPhysicalPixelBoundary() {
   wm::SetSnapsChildrenToPhysicalPixelBoundary(window_);
 }
 
-void WmWindowAura::SnapToPixelBoundaryIfNecessary() {
+void WmWindow::SnapToPixelBoundaryIfNecessary() {
   wm::SnapWindowToPixelBoundary(window_);
 }
 
-void WmWindowAura::SetChildrenUseExtendedHitRegion() {
+void WmWindow::SetChildrenUseExtendedHitRegion() {
   children_use_extended_hit_region_ = true;
   gfx::Insets mouse_extend(-kResizeOutsideBoundsSize, -kResizeOutsideBoundsSize,
                            -kResizeOutsideBoundsSize,
@@ -843,24 +840,23 @@ void WmWindowAura::SetChildrenUseExtendedHitRegion() {
       window_, mouse_extend, touch_extend));
 }
 
-std::unique_ptr<views::View> WmWindowAura::CreateViewWithRecreatedLayers() {
+std::unique_ptr<views::View> WmWindow::CreateViewWithRecreatedLayers() {
   return base::MakeUnique<wm::WindowMirrorView>(this);
 }
 
-void WmWindowAura::AddObserver(WmWindowObserver* observer) {
+void WmWindow::AddObserver(WmWindowObserver* observer) {
   observers_.AddObserver(observer);
 }
 
-void WmWindowAura::RemoveObserver(WmWindowObserver* observer) {
+void WmWindow::RemoveObserver(WmWindowObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
-bool WmWindowAura::HasObserver(const WmWindowObserver* observer) const {
+bool WmWindow::HasObserver(const WmWindowObserver* observer) const {
   return observers_.HasObserver(observer);
 }
 
-void WmWindowAura::AddTransientWindowObserver(
-    WmTransientWindowObserver* observer) {
+void WmWindow::AddTransientWindowObserver(WmTransientWindowObserver* observer) {
   if (!added_transient_observer_) {
     added_transient_observer_ = true;
     ::wm::TransientWindowManager::Get(window_)->AddObserver(this);
@@ -868,7 +864,7 @@ void WmWindowAura::AddTransientWindowObserver(
   transient_observers_.AddObserver(observer);
 }
 
-void WmWindowAura::RemoveTransientWindowObserver(
+void WmWindow::RemoveTransientWindowObserver(
     WmTransientWindowObserver* observer) {
   transient_observers_.RemoveObserver(observer);
   if (added_transient_observer_ &&
@@ -878,7 +874,7 @@ void WmWindowAura::RemoveTransientWindowObserver(
   }
 }
 
-void WmWindowAura::AddLimitedPreTargetHandler(ui::EventHandler* handler) {
+void WmWindow::AddLimitedPreTargetHandler(ui::EventHandler* handler) {
   // In mus AddPreTargetHandler() only works for windows created by this client.
   DCHECK(aura::Env::GetInstance()->mode() == aura::Env::Mode::LOCAL ||
          Shell::window_tree_client()->WasCreatedByThisClient(
@@ -886,11 +882,11 @@ void WmWindowAura::AddLimitedPreTargetHandler(ui::EventHandler* handler) {
   window_->AddPreTargetHandler(handler);
 }
 
-void WmWindowAura::RemoveLimitedPreTargetHandler(ui::EventHandler* handler) {
+void WmWindow::RemoveLimitedPreTargetHandler(ui::EventHandler* handler) {
   window_->RemovePreTargetHandler(handler);
 }
 
-WmWindowAura::WmWindowAura(aura::Window* window)
+WmWindow::WmWindow(aura::Window* window)
     : window_(window),
       // Mirrors that of aura::Window.
       observers_(base::ObserverList<WmWindowObserver>::NOTIFY_EXISTING_ONLY),
@@ -900,13 +896,7 @@ WmWindowAura::WmWindowAura(aura::Window* window)
   window_->SetProperty(kWmWindowKey, this);
 }
 
-// static
-bool WmWindowAura::HasInstance(const aura::Window* window) {
-  return window->GetProperty(kWmWindowKey) != nullptr;
-}
-
-void WmWindowAura::OnWindowHierarchyChanging(
-    const HierarchyChangeParams& params) {
+void WmWindow::OnWindowHierarchyChanging(const HierarchyChangeParams& params) {
   WmWindowObserver::TreeChangeParams wm_params;
   wm_params.target = Get(params.target);
   wm_params.new_parent = Get(params.new_parent);
@@ -915,8 +905,7 @@ void WmWindowAura::OnWindowHierarchyChanging(
     observer.OnWindowTreeChanging(this, wm_params);
 }
 
-void WmWindowAura::OnWindowHierarchyChanged(
-    const HierarchyChangeParams& params) {
+void WmWindow::OnWindowHierarchyChanged(const HierarchyChangeParams& params) {
   WmWindowObserver::TreeChangeParams wm_params;
   wm_params.target = Get(params.target);
   wm_params.new_parent = Get(params.new_parent);
@@ -925,14 +914,14 @@ void WmWindowAura::OnWindowHierarchyChanged(
     observer.OnWindowTreeChanged(this, wm_params);
 }
 
-void WmWindowAura::OnWindowStackingChanged(aura::Window* window) {
+void WmWindow::OnWindowStackingChanged(aura::Window* window) {
   for (auto& observer : observers_)
     observer.OnWindowStackingChanged(this);
 }
 
-void WmWindowAura::OnWindowPropertyChanged(aura::Window* window,
-                                           const void* key,
-                                           intptr_t old) {
+void WmWindow::OnWindowPropertyChanged(aura::Window* window,
+                                       const void* key,
+                                       intptr_t old) {
   if (key == aura::client::kShowStateKey) {
     ash::wm::GetWindowState(window_)->OnWindowShowStateChanged();
     return;
@@ -965,49 +954,47 @@ void WmWindowAura::OnWindowPropertyChanged(aura::Window* window,
     observer.OnWindowPropertyChanged(this, wm_property);
 }
 
-void WmWindowAura::OnWindowBoundsChanged(aura::Window* window,
-                                         const gfx::Rect& old_bounds,
-                                         const gfx::Rect& new_bounds) {
+void WmWindow::OnWindowBoundsChanged(aura::Window* window,
+                                     const gfx::Rect& old_bounds,
+                                     const gfx::Rect& new_bounds) {
   for (auto& observer : observers_)
     observer.OnWindowBoundsChanged(this, old_bounds, new_bounds);
 }
 
-void WmWindowAura::OnWindowDestroying(aura::Window* window) {
+void WmWindow::OnWindowDestroying(aura::Window* window) {
   for (auto& observer : observers_)
     observer.OnWindowDestroying(this);
 }
 
-void WmWindowAura::OnWindowDestroyed(aura::Window* window) {
+void WmWindow::OnWindowDestroyed(aura::Window* window) {
   for (auto& observer : observers_)
     observer.OnWindowDestroyed(this);
 }
 
-void WmWindowAura::OnWindowVisibilityChanging(aura::Window* window,
-                                              bool visible) {
+void WmWindow::OnWindowVisibilityChanging(aura::Window* window, bool visible) {
   DCHECK_EQ(window, window_);
   for (auto& observer : observers_)
     observer.OnWindowVisibilityChanging(this, visible);
 }
 
-void WmWindowAura::OnWindowVisibilityChanged(aura::Window* window,
-                                             bool visible) {
+void WmWindow::OnWindowVisibilityChanged(aura::Window* window, bool visible) {
   for (auto& observer : observers_)
     observer.OnWindowVisibilityChanged(Get(window), visible);
 }
 
-void WmWindowAura::OnWindowTitleChanged(aura::Window* window) {
+void WmWindow::OnWindowTitleChanged(aura::Window* window) {
   for (auto& observer : observers_)
     observer.OnWindowTitleChanged(this);
 }
 
-void WmWindowAura::OnTransientChildAdded(aura::Window* window,
-                                         aura::Window* transient) {
+void WmWindow::OnTransientChildAdded(aura::Window* window,
+                                     aura::Window* transient) {
   for (auto& observer : transient_observers_)
     observer.OnTransientChildAdded(this, Get(transient));
 }
 
-void WmWindowAura::OnTransientChildRemoved(aura::Window* window,
-                                           aura::Window* transient) {
+void WmWindow::OnTransientChildRemoved(aura::Window* window,
+                                       aura::Window* transient) {
   for (auto& observer : transient_observers_)
     observer.OnTransientChildRemoved(this, Get(transient));
 }