Improving window auto management between workspaces

chrome/browser/sessions/session_restore.cc

Index: chrome/browser/sessions/session_restore.cc
diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc
index 40ebe2761ec79cbb6c314d589f7060f957385c24..4a134601db2a9d09c6329d0c045d42b635a51da3 100644
--- a/chrome/browser/sessions/session_restore.cc
+++ b/chrome/browser/sessions/session_restore.cc
@@ -57,6 +57,9 @@
 #include "base/win/metro.h"
 #endif
 
+#if defined(USE_ASH)
+#include "ash/wm/window_util.h"
+#endif
 using content::NavigationController;
 using content::RenderWidgetHost;
 using content::WebContents;
@@ -1020,7 +1023,16 @@ class SessionRestoreImpl : public content::NotificationObserver {
     if (browser_ == browser)
       return;
 
+#if defined(USE_ASH)
+    // Prevent the auto window management for this window on show.
+    ash::wm::SetUserHasChangedWindowPositionOrSize(
+        browser->window()->GetNativeWindow(), true);
+#endif
     browser->window()->Show();
+#if defined(USE_ASH)
+    ash::wm::SetUserHasChangedWindowPositionOrSize(
+        browser->window()->GetNativeWindow(), false);
+#endif
     browser->set_is_session_restore(false);
 
     // TODO(jcampan): http://crbug.com/8123 we should not need to set the