Revert 164652 - speculative revert - this change may have caused print dialog test failures on XP.

chrome/browser/ui/views/frame/browser_frame_aura.cc

Index: chrome/browser/ui/views/frame/browser_frame_aura.cc
===================================================================
--- chrome/browser/ui/views/frame/browser_frame_aura.cc	(revision 164764)
+++ chrome/browser/ui/views/frame/browser_frame_aura.cc	(working copy)
@@ -23,7 +23,6 @@
 
 #if defined(USE_ASH)
 #include "ash/wm/property_util.h"
-#include "ash/wm/window_util.h"
 #endif
 
 #if !defined(OS_CHROMEOS)
@@ -110,11 +109,6 @@
         GetNativeWindow(),
         ash::WINDOW_PERSISTS_ACROSS_ALL_WORKSPACES_VALUE_NO);
   }
-  // Turn on auto window management if we don't need an explicit bounds.
-  // This way the requested bounds are honored.
-  if (!browser_view->browser()->bounds_overridden() &&
-      !browser_view->browser()->is_session_restore())
-    SetWindowAutoManaged();
 #endif
 }
 
@@ -166,13 +160,8 @@
   // RestoreFocus() when we become visible, which results in the web contents
   // being asked to focus, which places focus either in the web contents or in
   // the location bar as appropriate.
-  if (visible) {
-    // Once the window has been shown we know the requested bounds
-    // (if provided) have been honored and we can switch on window management.
-    SetWindowAutoManaged();
-
+  if (visible)
     browser_view_->RestoreFocus();
-  }
   views::NativeWidgetAura::OnWindowTargetVisibilityChanged(visible);
 }
 
@@ -230,11 +219,3 @@
 
 BrowserFrameAura::~BrowserFrameAura() {
 }
-
-void BrowserFrameAura::SetWindowAutoManaged() {
-#if defined(USE_ASH)
-  if (browser_view_->browser()->type() != Browser::TYPE_POPUP ||
-      browser_view_->browser()->is_app())
-    ash::wm::SetWindowPositionManaged(GetNativeWindow(), true);
-#endif
-}