Adds WmWindow and converts WindowState to use it

ash/wm/window_state.h

 // Copyright 2013 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_WM_WINDOW_STATE_H_
 #define ASH_WM_WINDOW_STATE_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
+#include "ash/wm/aura/wm_window_aura.h"
 #include "ash/wm/drag_details.h"
 #include "ash/wm/wm_types.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
-#include "ui/aura/window_observer.h"
 #include "ui/base/ui_base_types.h"
 
 namespace aura {
 class Window;
 }
 
 namespace gfx {
 class Rect;
 }
 
 namespace ash {
-class WorkspaceLayoutManager;
 class LockWindowState;
 class MaximizeModeWindowState;
 
 namespace wm {
 class WindowStateDelegate;
 class WindowStateObserver;
 class WMEvent;
+class WmWindow;
 
 // WindowState manages and defines ash specific window state and
 // behavior. Ash specific per-window state (such as ones that controls
 // window manager behavior) and ash specific window behavior (such as
 // maximize, minimize, snap sizing etc) should be added here instead
 // of defining separate functions (like |MaximizeWindow(aura::Window*
 // window)|) or using aura Window property.
 // The WindowState gets created when first accessed by
 // |wm::GetWindowState|, and deleted when the window is deleted.
 // Prefer using this class instead of passing aura::Window* around in
 // ash code as this is often what you need to interact with, and
 // accessing the window using |window()| is cheap.
-class ASH_EXPORT WindowState : public aura::WindowObserver {
+class ASH_EXPORT WindowState {
  public:
 
   // A subclass of State class represents one of the window's states
   // that corresponds to WindowStateType in Ash environment, e.g.
   // maximized, minimized or side snapped, as subclass.
   // Each subclass defines its own behavior and transition for each WMEvent.
   class State {
    public:
     State() {}
     virtual ~State() {}
@@ skipping 14 matching lines @@
     // Gets called before the state objects gets deactivated / detached from the
     // window, so that it can save the various states it is interested in.
     // Note: This only gets called when the state object gets changed.
     virtual void DetachState(WindowState* window_state) = 0;
 
    private:
     DISALLOW_COPY_AND_ASSIGN(State);
   };
 
   // Call GetWindowState() to instantiate this class.
-  ~WindowState() override;
+  ~WindowState();
 
-  aura::Window* window() { return window_; }
-  const aura::Window* window() const { return window_; }
+  // TODO(sky): remove these. They are temporary until converted to common
+  // types.
+  aura::Window* aura_window() { return WmWindowAura::GetAuraWindow(window_); }
+  const aura::Window* aura_window() const {
+    return WmWindowAura::GetAuraWindow(window_);
+  }
+
+  WmWindow* window() { return window_; }
+  const WmWindow* window() const { return window_; }
 
   bool HasDelegate() const;
   void SetDelegate(std::unique_ptr<WindowStateDelegate> delegate);
 
   // Returns the window's current ash state type.
   // Refer to WindowStateType definition in wm_types.h as for why Ash
   // has its own state type.
   WindowStateType GetStateType() const;
 
   // Predicates to check window state.
@@ skipping 34 matching lines @@
 
   void Activate();
   void Deactivate();
 
   // Set the window state to normal.
   // TODO(oshima): Change to use RESTORE event.
   void Restore();
 
   // Caches, then disables always on top state and then stacks |window_| below
   // |window_on_top| if a |window_| is currently in always on top state.
-  void DisableAlwaysOnTop(aura::Window* window_on_top);
+  void DisableAlwaysOnTop(WmWindow* window_on_top);
 
   // Restores always on top state that a window might have cached.
   void RestoreAlwaysOnTop();
 
   // Invoked when a WMevent occurs, which drives the internal
   // state machine.
   void OnWMEvent(const WMEvent* event);
 
   // TODO(oshima): Try hiding these methods and making them accessible only to
   // state impl. State changes should happen through events (as much
@@ skipping 131 matching lines @@
   // also allow the shelf to be shown in some situations.
   bool in_immersive_fullscreen() const {
     return in_immersive_fullscreen_;
   }
   void set_in_immersive_fullscreen(bool enable) {
     in_immersive_fullscreen_ = enable;
   }
 
   // Creates and takes ownership of a pointer to DragDetails when resizing is
   // active. This should be done before a resizer gets created.
-  void CreateDragDetails(aura::Window* window,
-                         const gfx::Point& point_in_parent,
+  void CreateDragDetails(const gfx::Point& point_in_parent,
                          int window_component,
                          aura::client::WindowMoveSource source);
 
   // Deletes and clears a pointer to DragDetails. This should be done when the
   // resizer gets destroyed.
   void DeleteDragDetails();
 
   // Sets the currently stored restore bounds and clears the restore bounds.
   void SetAndClearRestoreBounds();
 
   // Returns a pointer to DragDetails during drag operations.
   const DragDetails* drag_details() const { return drag_details_.get(); }
   DragDetails* drag_details() { return drag_details_.get(); }
 
-  // aura::WindowObserver overrides:
-  void OnWindowPropertyChanged(aura::Window* window,
-                               const void* key,
-                               intptr_t old) override;
+  // Called from the associated WmWindow once the show state changes.
+  void OnWindowShowStateChanged();
 
  private:
   friend class DefaultState;
   friend class ash::LockWindowState;
   friend class ash::MaximizeModeWindowState;
   friend ASH_EXPORT WindowState* GetWindowState(aura::Window*);
   FRIEND_TEST_ALL_PREFIXES(WindowAnimationsTest, CrossFadeToBounds);
   FRIEND_TEST_ALL_PREFIXES(WindowAnimationsTest,
                            CrossFadeToBoundsFromTransform);
 
-  explicit WindowState(aura::Window* window);
+  explicit WindowState(WmWindow* window);
 
   WindowStateDelegate* delegate() { return delegate_.get(); }
 
   // Returns the window's current always_on_top state.
   bool GetAlwaysOnTop() const;
 
   // Returns the window's current show state.
   ui::WindowShowState GetShowState() const;
 
   // Sets the window's bounds in screen coordinates.
@@ skipping 19 matching lines @@
 
   // Sets the wndow's |bounds| and transitions to the new bounds with
   // a scale animation.
   void SetBoundsDirectAnimated(const gfx::Rect& bounds);
 
   // Sets the window's |bounds| and transition to the new bounds with
   // a cross fade animation.
   void SetBoundsDirectCrossFade(const gfx::Rect& bounds);
 
   // The owner of this window settings.
-  aura::Window* window_;
+  WmWindow* window_;
   std::unique_ptr<WindowStateDelegate> delegate_;
 
   bool window_position_managed_;
   bool bounds_changed_by_user_;
   bool panel_attached_;
   bool ignored_by_shelf_;
   bool can_consume_system_keys_;
   bool top_row_keys_are_function_keys_;
   std::unique_ptr<DragDetails> drag_details_;
 
@@ skipping 13 matching lines @@
 
   // True to ignore a property change event to avoid reentrance in
   // UpdateWindowStateType()
   bool ignore_property_change_;
 
   std::unique_ptr<State> current_state_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowState);
 };
 
-// Returns the WindowState for active window. Returns |NULL|
-// if there is no active window.
-ASH_EXPORT WindowState* GetActiveWindowState();
-
-// Returns the WindowState for |window|. Creates WindowState
-// if it didn't exist. The settings object is owned by |window|.
-ASH_EXPORT WindowState* GetWindowState(aura::Window* window);
-
-// const version of GetWindowState.
-ASH_EXPORT const WindowState*
-GetWindowState(const aura::Window* window);
-
 }  // namespace wm
 }  // namespace ash
 
 #endif  // ASH_WM_WINDOW_STATE_H_