Merge 236134 "Ensure that the first browser window which is crea..."

ash/wm/window_positioner.cc

 // Copyright 2013 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/window_positioner.h"
 
 #include "ash/ash_switches.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
@@ skipping 32 matching lines @@
 const int kForceMaximizeWidthLimitDisabled = 640;
 
 // The time in milliseconds which should be used to visually move a window
 // through an automatic "intelligent" window management option.
 const int kWindowAutoMoveDurationMS = 125;
 
 // If set to true all window repositioning actions will be ignored. Set through
 // WindowPositioner::SetIgnoreActivations().
 static bool disable_auto_positioning = false;
 
+// If set to true, by default the first window in ASH will be maxmized.
+static bool maximize_first_window = false;
+
 // Check if any management should be performed (with a given |window|).
 bool UseAutoWindowManager(const aura::Window* window) {
   if (disable_auto_positioning)
     return false;
   const wm::WindowState* window_state = wm::GetWindowState(window);
   return window_state->tracked_by_workspace() &&
       window_state->window_position_managed();
 }
 
 // Check if a given |window| can be managed. This includes that it's state is
@@ skipping 167 matching lines @@
   // If there is no valid other window we take and adjust the passed coordinates
   // and show state.
   if (!top_window) {
     gfx::Rect work_area = screen->GetDisplayNearestWindow(target).work_area();
 
     bounds_in_out->AdjustToFit(work_area);
     // Use adjusted saved bounds, if there is one.
     if (is_saved_bounds)
       return;
     // When using "small screens" we want to always open in full screen mode.
-    if (show_state_in == ui::SHOW_STATE_DEFAULT &&
-        work_area.width() <= GetForceMaximizedWidthLimit() &&
-        (!new_window || !wm::GetWindowState(new_window)->IsFullscreen())) {
+    if (show_state_in == ui::SHOW_STATE_DEFAULT && (maximize_first_window ||
+         (work_area.width() <= GetForceMaximizedWidthLimit() &&
+         (!new_window || !wm::GetWindowState(new_window)->IsFullscreen())))) {
       *show_state_out = ui::SHOW_STATE_MAXIMIZED;
     }
     return;
   }
   bool maximized = wm::GetWindowState(top_window)->IsMaximized();
   // We ignore the saved show state, but look instead for the top level
   // window's show state.
   if (show_state_in == ui::SHOW_STATE_DEFAULT) {
     *show_state_out = maximized ? ui::SHOW_STATE_MAXIMIZED :
         ui::SHOW_STATE_DEFAULT;
@@ skipping 155 matching lines @@
       work_area.width()) ||
       (old_pos.height() + popup_position_offset_from_screen_corner_y >=
        work_area.height()))
     return AlignPopupPosition(old_pos, work_area, grid);
   const gfx::Rect result = SmartPopupPosition(old_pos, work_area, grid);
   if (!result.IsEmpty())
     return AlignPopupPosition(result, work_area, grid);
   return NormalPopupPosition(old_pos, work_area);
 }
 
+// static
+void WindowPositioner::SetMaximizeFirstWindow(bool maximize) {
+  maximize_first_window = maximize;
+}
+
 gfx::Rect WindowPositioner::NormalPopupPosition(
     const gfx::Rect& old_pos,
     const gfx::Rect& work_area) {
   int w = old_pos.width();
   int h = old_pos.height();
   // Note: The 'last_popup_position' is checked and kept relative to the
   // screen size. The offsetting will be done in the last step when the
   // target rectangle gets returned.
   bool reset = false;
   if (last_popup_position_y_ + h > work_area.height() ||
@@ skipping 103 matching lines @@
   // If the alignment was pushing the window out of the screen, we ignore the
   // alignment for that call.
   if (abs(pos.right() - work_area.right()) < grid)
     x = work_area.right() - w;
   if (abs(pos.bottom() - work_area.bottom()) < grid)
     y = work_area.bottom() - h;
   return gfx::Rect(x, y, w, h);
 }
 
 }  // namespace ash