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

ash/wm_window.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/wm_window.h"
 
 #include "ash/ash_constants.h"
 #include "ash/public/cpp/config.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/public/cpp/window_properties.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/wm/resize_handle_window_targeter.h"
-#include "ash/wm/resize_shadow_controller.h"
 #include "ash/wm/widget_finder.h"
 #include "ash/wm/window_animations.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm_transient_window_observer.h"
 #include "base/memory/ptr_util.h"
 #include "services/ui/public/interfaces/window_manager_constants.mojom.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/focus_client.h"
@@ skipping 24 matching lines @@
 
 namespace ash {
 namespace {
 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(WmWindow, kWmWindowKey, nullptr);
 
 static_assert(aura::Window::kInitialId == kShellWindowId_Invalid,
               "ids must match");
 
 }  // namespace
 
-// static
-bool WmWindow::default_use_empty_minimum_size_for_testing_ = false;
-
 WmWindow::~WmWindow() {
   if (added_transient_observer_)
     ::wm::TransientWindowManager::Get(window_)->RemoveObserver(this);
 }
 
 // static
 const WmWindow* WmWindow::Get(const aura::Window* window) {
   if (!window)
     return nullptr;
 
@@ skipping 76 matching lines @@
 
 display::Display WmWindow::GetDisplayNearestWindow() {
   return display::Screen::GetScreen()->GetDisplayNearestWindow(window_);
 }
 
 bool WmWindow::HasNonClientArea() {
   return window_->delegate() ? true : false;
 }
 
 int WmWindow::GetNonClientComponent(const gfx::Point& location) {
-  return window_->delegate()
-             ? window_->delegate()->GetNonClientComponent(location)
-             : HTNOWHERE;
+  return wm::GetNonClientComponent(window_, location);
 }
 
 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 WmWindow::ConvertPointToScreen(const gfx::Point& point) const {
@@ skipping 14 matching lines @@
   return result;
 }
 
 gfx::Rect WmWindow::ConvertRectFromScreen(const gfx::Rect& rect) const {
   gfx::Rect result(rect);
   ::wm::ConvertRectFromScreen(window_, &result);
   return result;
 }
 
 gfx::Size WmWindow::GetMinimumSize() const {
-  return window_->delegate() && !use_empty_minimum_size_for_testing_
-             ? window_->delegate()->GetMinimumSize()
-             : gfx::Size();
+  return window_->delegate() ? window_->delegate()->GetMinimumSize()
+                             : gfx::Size();
 }
 
 gfx::Size WmWindow::GetMaximumSize() const {
   return window_->delegate() ? window_->delegate()->GetMaximumSize()
                              : gfx::Size();
 }
 
 bool WmWindow::GetTargetVisibility() const {
   return window_->TargetVisibility();
 }
@@ skipping 302 matching lines @@
 }
 
 std::vector<WmWindow*> WmWindow::GetChildren() {
   return FromAuraWindows(window_->children());
 }
 
 WmWindow* WmWindow::GetChildByShellWindowId(int id) {
   return Get(window_->GetChildById(id));
 }
 
-void WmWindow::ShowResizeShadow(int component) {
-  if (Shell::GetAshConfig() == Config::MASH) {
-    // TODO: http://crbug.com/640773.
-    return;
-  }
-  ResizeShadowController* resize_shadow_controller =
-      Shell::Get()->resize_shadow_controller();
-  if (resize_shadow_controller)
-    resize_shadow_controller->ShowShadow(window_, component);
-}
-
-void WmWindow::HideResizeShadow() {
-  if (Shell::GetAshConfig() == Config::MASH) {
-    // TODO: http://crbug.com/640773.
-    return;
-  }
-  ResizeShadowController* resize_shadow_controller =
-      Shell::Get()->resize_shadow_controller();
-  if (resize_shadow_controller)
-    resize_shadow_controller->HideShadow(window_);
-}
-
 void WmWindow::InstallResizeHandleWindowTargeter(
     ImmersiveFullscreenController* immersive_fullscreen_controller) {
   window_->SetEventTargeter(base::MakeUnique<ResizeHandleWindowTargeter>(
       window_, immersive_fullscreen_controller));
 }
 
 void WmWindow::SetBoundsInScreenBehaviorForChildren(
     BoundsInScreenBehavior behavior) {
   window_->SetProperty(
       kUsesScreenCoordinatesKey,
@@ skipping 47 matching lines @@
   DCHECK(Shell::GetAshConfig() != Config::MASH ||
          Shell::window_tree_client()->WasCreatedByThisClient(
              aura::WindowMus::Get(window_)));
   window_->AddPreTargetHandler(handler);
 }
 
 void WmWindow::RemoveLimitedPreTargetHandler(ui::EventHandler* handler) {
   window_->RemovePreTargetHandler(handler);
 }
 
-WmWindow::WmWindow(aura::Window* window)
-    : window_(window),
-      use_empty_minimum_size_for_testing_(
-          default_use_empty_minimum_size_for_testing_) {
+WmWindow::WmWindow(aura::Window* window) : window_(window) {
   window_->SetProperty(kWmWindowKey, this);
 }
 
 void WmWindow::OnTransientChildAdded(aura::Window* window,
                                      aura::Window* transient) {
   for (auto& observer : transient_observers_)
     observer.OnTransientChildAdded(this, Get(transient));
 }
 
 void WmWindow::OnTransientChildRemoved(aura::Window* window,
                                        aura::Window* transient) {
   for (auto& observer : transient_observers_)
     observer.OnTransientChildRemoved(this, Get(transient));
 }
 
 }  // namespace ash