Add a maximizing logic flag

chrome/browser/ui/window_sizer/window_sizer_ash.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/window_sizer/window_sizer.h"
 
+#include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/wm/window_cycle_controller.h"
 #include "ash/wm/window_util.h"
+#include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/gfx/screen.h"
 
 namespace {
 
 // When a window gets opened in default mode and the screen is less then this
-// width, the window will get opened in maximized mode.
+// width, the window will get opened in maximized mode. This value can be
+// reduced to a "tame" number if the feature is disabled.
 const int kForceMaximizeWidthLimit = 1366;
+const int kForceMaximizeWidthLimitDisabled = 640;
 
 // Check if the given browser is 'valid': It is a tabbed, non minimized
 // window, which intersects with the |bounds_in_screen| area of a given screen.
 bool IsValidBrowser(Browser* browser, const gfx::Rect& bounds_in_screen) {
   return (browser && browser->window() &&
           !browser->is_type_popup() &&
           !browser->window()->IsMinimized() &&
           browser->window()->GetNativeWindow() &&
           bounds_in_screen.Intersects(
               browser->window()->GetNativeWindow()->GetBoundsInScreen()));
@@ skipping 91 matching lines @@
       return true;
     }
   }
   return false;
 }
 
 }  // namespace
 
 // static
 int WindowSizer::GetForceMaximizedWidthLimit() {
-  return kForceMaximizeWidthLimit;
+  static int maximum_limit = 0;
+  if (!maximum_limit) {
+    maximum_limit = CommandLine::ForCurrentProcess()->HasSwitch(
+                        ash::switches::kAshDisableAutoMaximizing) ?
+        kForceMaximizeWidthLimitDisabled : kForceMaximizeWidthLimit;
+  }
+  return maximum_limit;
 }
 
 bool WindowSizer::GetBoundsOverrideAsh(gfx::Rect* bounds_in_screen,
                                        ui::WindowShowState* show_state) const {
   DCHECK(show_state);
   DCHECK(bounds_in_screen);
 
   if (browser_ &&
       browser_->host_desktop_type() != chrome::HOST_DESKTOP_TYPE_ASH) {
     return false;
@@ skipping 16 matching lines @@
     aura::Window* top_window = GetTopWindow(work_area);
     // Our window should not have any impact if we are already on top.
     if (browser_->window() &&
         top_window == browser_->window()->GetNativeWindow())
       top_window = NULL;
     // If there is no valid other window we take the coordinates as is.
     if (!count || !top_window) {
       // When using "small screens" we want to always open in full screen mode.
       if (passed_show_state == ui::SHOW_STATE_DEFAULT &&
           !browser_->is_session_restore() &&
-          work_area.width() < kForceMaximizeWidthLimit &&
+          work_area.width() < GetForceMaximizedWidthLimit() &&
           (!browser_->window() || !browser_->window()->IsFullscreen()) &&
           (!browser_->fullscreen_controller() ||
            !browser_->fullscreen_controller()->IsFullscreenForBrowser()))
         *show_state = ui::SHOW_STATE_MAXIMIZED;
       return true;
     }
     bool maximized = ash::wm::IsWindowMaximized(top_window);
     // We ignore the saved show state, but look instead for the top level
     // window's show state.
     if (passed_show_state == ui::SHOW_STATE_DEFAULT) {
@@ skipping 42 matching lines @@
   if (default_width > kMaximumWindowWidth) {
     // The window should get centered on the screen and not follow the grid.
     offset_x = (work_area.width() - kMaximumWindowWidth) / 2;
     default_width = kMaximumWindowWidth;
   }
   default_bounds->SetRect(work_area.x() + offset_x,
                           work_area.y() + kDesktopBorderSize,
                           default_width,
                           default_height);
 }