Convert determining restore bounds to use ash/common type

ash/wm/maximize_mode/maximize_mode_window_state.cc

 // Copyright 2014 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/maximize_mode/maximize_mode_window_state.h"
 
 #include <utility>
 
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/shell_window_ids.h"
@@ skipping 61 matching lines @@
     // dimensions since they are likely to be the result from some other state
     // object logic.
     if (state_object->HasRestoreBounds())
       bounds_in_parent = state_object->GetRestoreBoundsInParent();
     else
       bounds_in_parent = state_object->window()->GetBounds();
   }
   return GetCenteredBounds(bounds_in_parent, state_object);
 }
 
+gfx::Rect GetRestoreBounds(wm::WindowState* window_state) {
+  if (window_state->IsMinimized() || window_state->IsMaximized() ||
+      window_state->IsFullscreen()) {
+    gfx::Rect restore_bounds = window_state->GetRestoreBoundsInScreen();
+    if (!restore_bounds.IsEmpty())
+      return restore_bounds;
+  }
+  gfx::Rect bounds = window_state->window()->GetBoundsInScreen();
+  if (window_state->IsDocked()) {
+    gfx::Rect restore_bounds = window_state->GetRestoreBoundsInScreen();
+    // Use current window horizontal offset origin in order to preserve docked
+    // alignment but preserve restored size and vertical offset for the time
+    // when the window gets undocked.
+    if (!restore_bounds.IsEmpty()) {
+      bounds.set_size(restore_bounds.size());
+      bounds.set_y(restore_bounds.y());
+    }
+  }
+  return bounds;
+}
+
 }  // namespace
 
 // static
 void MaximizeModeWindowState::UpdateWindowPosition(
     wm::WindowState* window_state) {
   gfx::Rect bounds_in_parent = GetBoundsInMaximizedMode(window_state);
   if (bounds_in_parent == window_state->window()->GetBounds())
     return;
   window_state->SetBoundsDirect(bounds_in_parent);
 }
@@ skipping 112 matching lines @@
   return current_state_type_;
 }
 
 void MaximizeModeWindowState::AttachState(
     wm::WindowState* window_state,
     wm::WindowState::State* previous_state) {
   current_state_type_ = previous_state->GetType();
 
   aura::Window* window =
       ash::WmWindowAura::GetAuraWindow(window_state->window());
-  views::Widget* widget = views::Widget::GetWidgetForNativeWindow(window);
-  if (widget) {
-    gfx::Rect bounds = widget->GetRestoredBounds();
-    if (!bounds.IsEmpty()) {
-      // We do not want to do a session restore to our window states. Therefore
-      // we tell the window to use the current default states instead.
-      window->SetProperty(ash::kRestoreShowStateOverrideKey,
-                          window_state->GetShowState());
-      window->SetProperty(ash::kRestoreBoundsOverrideKey,
-                          new gfx::Rect(widget->GetRestoredBounds()));
-    }
+  gfx::Rect restore_bounds = GetRestoreBounds(window_state);
+  if (!restore_bounds.IsEmpty()) {
+    // We do not want to do a session restore to our window states. Therefore
+    // we tell the window to use the current default states instead.
+    window->SetProperty(ash::kRestoreShowStateOverrideKey,
+                        window_state->GetShowState());
+    window->SetProperty(ash::kRestoreBoundsOverrideKey,
+                        new gfx::Rect(restore_bounds));
   }
 
   // Initialize the state to a good preset.
   if (current_state_type_ != wm::WINDOW_STATE_TYPE_MAXIMIZED &&
       current_state_type_ != wm::WINDOW_STATE_TYPE_MINIMIZED &&
       current_state_type_ != wm::WINDOW_STATE_TYPE_FULLSCREEN &&
       current_state_type_ != wm::WINDOW_STATE_TYPE_PINNED) {
     UpdateWindow(window_state,
                  GetMaximizedOrCenteredWindowType(window_state),
                  true);
@@ skipping 83 matching lines @@
       // avoid flashing.
       if (window_state->IsMaximized())
         window_state->SetBoundsDirectCrossFade(bounds_in_parent);
       else
         window_state->SetBoundsDirectAnimated(bounds_in_parent);
     }
   }
 }
 
 }  // namespace ash