Override MAXIMIZED window show state if window size / position is manually specified.

chrome/browser/ui/browser_window_state.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/browser_window_state.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 143 matching lines @@
   *bounds = browser->override_bounds();
   WindowSizer::GetBrowserWindowBoundsAndShowState(browser->app_name(),
                                                   *bounds,
                                                   browser,
                                                   bounds,
                                                   show_state);
 
   const base::CommandLine& parsed_command_line =
       *base::CommandLine::ForCurrentProcess();
 
-  if (parsed_command_line.HasSwitch(switches::kWindowSize)) {
+  internal::UpdateWindowBoundsAndShowStateFromCommandLine(parsed_command_line,
+                                                          bounds, show_state);
+}
+
+namespace internal {
+
+void UpdateWindowBoundsAndShowStateFromCommandLine(
+    const base::CommandLine& command_line,
+    gfx::Rect* bounds,
+    ui::WindowShowState* show_state) {
+  // Allow command-line flags to override the window size and position. If
+  // either of these is specified then set the show state to NORMAL so that
+  // they are immediately respected.
+  if (command_line.HasSwitch(switches::kWindowSize)) {
+    std::string str = command_line.GetSwitchValueASCII(switches::kWindowSize);
+    int width, height;
+    if (ParseCommaSeparatedIntegers(str, &width, &height)) {
+      bounds->set_size(gfx::Size(width, height));
+      *show_state = ui::SHOW_STATE_NORMAL;
+    }
+  }
+  if (command_line.HasSwitch(switches::kWindowPosition)) {
     std::string str =
-        parsed_command_line.GetSwitchValueASCII(switches::kWindowSize);
-    int width, height;
-    if (ParseCommaSeparatedIntegers(str, &width, &height))
-      bounds->set_size(gfx::Size(width, height));
-  }
-  if (parsed_command_line.HasSwitch(switches::kWindowPosition)) {
-    std::string str =
-        parsed_command_line.GetSwitchValueASCII(switches::kWindowPosition);
+        command_line.GetSwitchValueASCII(switches::kWindowPosition);
     int x, y;
-    if (ParseCommaSeparatedIntegers(str, &x, &y))
+    if (ParseCommaSeparatedIntegers(str, &x, &y)) {
       bounds->set_origin(gfx::Point(x, y));
+      *show_state = ui::SHOW_STATE_NORMAL;
+    }
   }
 }
 
+}  // namespace internal
+
 }  // namespace chrome