move switch

ash/common/wm/window_state.cc

 // 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.
 
 #include "ash/common/wm/window_state.h"
 
 #include <utility>
 
 #include "ash/common/wm/default_state.h"
 #include "ash/common/wm/window_positioning_utils.h"
@@ skipping 294 matching lines @@
       panel_attached_(true),
       ignored_by_shelf_(false),
       can_consume_system_keys_(false),
       unminimize_to_restore_bounds_(false),
       in_immersive_fullscreen_(false),
       hide_shelf_when_fullscreen_(true),
       minimum_visibility_(false),
       can_be_dragged_(true),
       cached_always_on_top_(false),
       ignore_property_change_(false),
-      current_state_(new DefaultState(ToWindowStateType(GetShowState()))) {}
+      current_state_(new DefaultState(ToWindowStateType(GetShowState()))),
+      vk_restore_bounds_(gfx::Rect()) {
+  window->AddObserver(this);
+}
 
 bool WindowState::GetAlwaysOnTop() const {
   return window_->IsAlwaysOnTop();
 }
 
 ui::WindowShowState WindowState::GetShowState() const {
   return window_->GetShowState();
 }
 
 void WindowState::SetBoundsInScreen(const gfx::Rect& bounds_in_screen) {
@@ skipping 68 matching lines @@
   // No animation is necessary in that case, thus just change the bounds and
   // quit.
   if (!window_->GetTargetVisibility()) {
     SetBoundsConstrained(new_bounds);
     return;
   }
 
   window_->SetBoundsDirectCrossFade(new_bounds);
 }
 
+void WindowState::OnWindowPropertyChanged(WmWindow* window,
+                                          WmWindowProperty property) {
+  if (property != ash::WmWindowProperty::VK_NEW_BOUNDS)
+    return;
+
+  gfx::Rect* new_bounds = window->GetRectProperty(property);
+
+  if (new_bounds) {
+    vk_restore_bounds_ = window->GetBounds();
+    window->SetBounds(*new_bounds);
+  } else {
+    window->SetBounds(vk_restore_bounds_);
+    vk_restore_bounds_ = gfx::Rect();
+  }
+}
+
 }  // namespace wm
 }  // namespace ash