move switch

ash/common/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_COMMON_WM_WINDOW_STATE_H_
 #define ASH_COMMON_WM_WINDOW_STATE_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
 #include "ash/common/wm/drag_details.h"
 #include "ash/common/wm/wm_types.h"
+#include "ash/common/wm_window_observer.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "ui/base/ui_base_types.h"
 
 namespace aura {
 class Window;
 }
 
 namespace gfx {
@@ skipping 14 matching lines @@
 // 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 {
+class ASH_EXPORT WindowState : public WmWindowObserver {
  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 13 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.
-  virtual ~WindowState();
+  ~WindowState() override;
 
   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.
@@ skipping 267 matching lines @@
   void SetBoundsConstrained(const gfx::Rect& bounds);
 
   // 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);
 
+  // ash::WmWindowObserver
+  void OnWindowPropertyChanged(WmWindow* window,
+                               WmWindowProperty property) override;
+
   // The owner of this window settings.
   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_;
   std::unique_ptr<DragDetails> drag_details_;
@@ skipping 13 matching lines @@
   std::unique_ptr<gfx::Rect> pre_auto_manage_window_bounds_;
 
   base::ObserverList<WindowStateObserver> observer_list_;
 
   // True to ignore a property change event to avoid reentrance in
   // UpdateWindowStateType()
   bool ignore_property_change_;
 
   std::unique_ptr<State> current_state_;
 
+  // Restore bounds of window when moved by virtual keyboard.
+  gfx::Rect vk_restore_bounds_;
+
   DISALLOW_COPY_AND_ASSIGN(WindowState);
 };
 
 }  // namespace wm
 }  // namespace ash
 
 #endif  // ASH_COMMON_WM_WINDOW_STATE_H_