Improving window auto management between workspaces

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

 // Copyright (c) 2012 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 "chrome/browser/ui/views/frame/browser_frame_aura.h"
 
 #include "base/command_line.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/system_menu_model_delegate.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_observer.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/gfx/font.h"
 #include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/view.h"
 
 #if defined(USE_ASH)
 #include "ash/wm/property_util.h"
+#include "ash/wm/window_util.h"
 #endif
 
 #if !defined(OS_CHROMEOS)
 #include "chrome/browser/ui/views/frame/desktop_browser_frame_aura.h"
 #endif
 
 using aura::Window;
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserFrameAura::WindowPropertyWatcher
@@ skipping 66 matching lines @@
   GetNativeWindow()->AddObserver(window_property_watcher_.get());
 #if defined(USE_ASH)
   // Tabbed browsers and apps (some apps are TYPE_POPUP) get their own
   // workspace.
   if (browser_view->browser()->type() != Browser::TYPE_POPUP ||
       browser_view->browser()->is_app()) {
     ash::SetPersistsAcrossAllWorkspaces(
         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
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserFrameAura, views::ContextMenuController overrides:
 void BrowserFrameAura::ShowContextMenuForView(views::View* source,
                                               const gfx::Point& p) {
   // Only show context menu if point is in unobscured parts of browser, i.e.
   // if NonClientHitTest returns :
   // - HTCAPTION: in title bar or unobscured part of tabstrip
@@ skipping 31 matching lines @@
   GetNativeWindow()->RemoveObserver(window_property_watcher_.get());
   views::NativeWidgetAura::OnWindowDestroying();
 }
 
 void BrowserFrameAura::OnWindowTargetVisibilityChanged(bool visible) {
   // On Aura when the BrowserView is shown it tries to restore focus, but can
   // be blocked when this parent BrowserFrameAura isn't visible. Therefore we
   // 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)
+  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();
+
     browser_view_->RestoreFocus();
+  }
   views::NativeWidgetAura::OnWindowTargetVisibilityChanged(visible);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserFrameAura, NativeBrowserFrame implementation:
 
 views::NativeWidget* BrowserFrameAura::AsNativeWidget() {
   return this;
 }
 
@@ skipping 37 matching lines @@
     return new DesktopBrowserFrameAura(browser_frame, browser_view);
 #endif
   return new BrowserFrameAura(browser_frame, browser_view);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserFrameAura, private:
 
 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
+}