Removes/promotes functions from WmWindowMus to WmWindowAura

ash/aura/wm_window_aura.h

 // 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.
 
 #ifndef ASH_AURA_WM_WINDOW_AURA_H_
 #define ASH_AURA_WM_WINDOW_AURA_H_
 
 #include "ash/ash_export.h"
 #include "ash/common/wm_window.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "ui/aura/window_observer.h"
 #include "ui/wm/core/transient_window_observer.h"
 
 namespace ash {
 
+class WmWindowAuraTestApi;
+
 // WmWindowAura is tied to the life of the underlying aura::Window. Use the
 // static Get() function to obtain a WmWindowAura from an aura::Window.
 class ASH_EXPORT WmWindowAura : public WmWindow,
                                 public aura::WindowObserver,
                                 public ::wm::TransientWindowObserver {
  public:
   // NOTE: this class is owned by the corresponding window. You shouldn't delete
   // TODO(sky): friend deleter and make private.
   ~WmWindowAura() override;
 
@@ skipping 11 matching lines @@
 
   static aura::Window* GetAuraWindow(WmWindow* wm_window) {
     return const_cast<aura::Window*>(
         GetAuraWindow(const_cast<const WmWindow*>(wm_window)));
   }
   static const aura::Window* GetAuraWindow(const WmWindow* wm_window);
 
   aura::Window* aura_window() { return window_; }
   const aura::Window* aura_window() const { return window_; }
 
+  // See description of |children_use_extended_hit_region_|.
+  bool ShouldUseExtendedHitRegion() const;
+
   // WmWindow:
   void Destroy() override;
   const WmWindow* GetRootWindow() const override;
   WmRootWindowController* GetRootWindowController() override;
   WmShell* GetShell() const override;
   void SetName(const char* name) override;
   std::string GetName() const override;
   void SetTitle(const base::string16& title) override;
   base::string16 GetTitle() const override;
   void SetShellWindowId(int id) override;
   int GetShellWindowId() const override;
   WmWindow* GetChildByShellWindowId(int id) override;
   ui::wm::WindowType GetType() const override;
   int GetAppType() const override;
   void SetAppType(int app_type) const override;
-  bool IsBubble() override;
   ui::Layer* GetLayer() override;
   bool GetLayerTargetVisibility() override;
   bool GetLayerVisible() override;
   display::Display GetDisplayNearestWindow() override;
   bool HasNonClientArea() override;
   int GetNonClientComponent(const gfx::Point& location) override;
   gfx::Point ConvertPointToTarget(const WmWindow* target,
                                   const gfx::Point& point) const override;
   gfx::Point ConvertPointToScreen(const gfx::Point& point) const override;
   gfx::Point ConvertPointFromScreen(const gfx::Point& point) const override;
@@ skipping 138 matching lines @@
   void OnWindowVisibilityChanged(aura::Window* window, bool visible) override;
   void OnWindowTitleChanged(aura::Window* window) override;
 
   // ::wm::TransientWindowObserver overrides:
   void OnTransientChildAdded(aura::Window* window,
                              aura::Window* transient) override;
   void OnTransientChildRemoved(aura::Window* window,
                                aura::Window* transient) override;
 
  private:
+  friend class WmWindowAuraTestApi;
+
   aura::Window* window_;
 
   base::ObserverList<WmWindowObserver> observers_;
 
   bool added_transient_observer_ = false;
   base::ObserverList<WmTransientWindowObserver> transient_observers_;
 
+  // If true child windows should get a slightly larger hit region to make
+  // resizing easier.
+  bool children_use_extended_hit_region_ = false;
+
+  // Default value for |use_empty_minimum_size_for_testing_|.
+  static bool default_use_empty_minimum_size_for_testing_;
+
+  // If true the minimum size is 0x0, default is minimum size comes from widget.
+  bool use_empty_minimum_size_for_testing_;
+
   DISALLOW_COPY_AND_ASSIGN(WmWindowAura);
 };
 
 }  // namespace ash
 
 #endif  // ASH_AURA_WM_WINDOW_AURA_H_