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

chrome/browser/ui/browser_window_state_unittest.cc

Index: chrome/browser/ui/browser_window_state_unittest.cc
diff --git a/chrome/browser/ui/browser_window_state_unittest.cc b/chrome/browser/ui/browser_window_state_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..a3325dda5a66999100c97fda55ac0fb9bd910cc7
--- /dev/null
+++ b/chrome/browser/ui/browser_window_state_unittest.cc
@@ -0,0 +1,89 @@
+// Copyright 2017 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 "base/command_line.h"
+#include "chrome/common/chrome_switches.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/base/ui_base_types.h"
+#include "ui/gfx/geometry/rect.h"
+
+namespace chrome {
+
+namespace internal {
+
+namespace {
+
+constexpr int kDefaultWidth = 1920;
+constexpr int kDefaultHeight = 1200;
+constexpr int kDefaultOffsetX = 0;
+constexpr int kDefaultOffsetY = 0;
+constexpr ui::WindowShowState kDefaultShowState = ui::SHOW_STATE_MAXIMIZED;
+
+class BrowserWindowStateTest : public testing::Test {
+ public:
+  BrowserWindowStateTest()
+      : bounds_(gfx::Point(kDefaultOffsetX, kDefaultOffsetY),
+                gfx::Size(kDefaultWidth, kDefaultHeight)),
+        show_state_(kDefaultShowState),
+        command_line_(base::CommandLine::NO_PROGRAM) {}
+
+  gfx::Rect bounds_;
+  ui::WindowShowState show_state_;
+  base::CommandLine command_line_;
+};
+
+}  // namespace
+
+TEST_F(BrowserWindowStateTest, NoCommandLineLeavesParamsIntact) {
+  UpdateWindowBoundsAndShowStateFromCommandLine(command_line_, &bounds_,
+                                                &show_state_);
+  EXPECT_EQ(bounds_.x(), kDefaultOffsetX);
+  EXPECT_EQ(bounds_.y(), kDefaultOffsetY);
+  EXPECT_EQ(bounds_.width(), kDefaultWidth);
+  EXPECT_EQ(bounds_.height(), kDefaultHeight);
+  EXPECT_EQ(show_state_, kDefaultShowState);
+}
+
+TEST_F(BrowserWindowStateTest, InvalidCommandLineLeavesParamsIntact) {
+  command_line_.AppendSwitchASCII(switches::kWindowSize, "0,abc");
+  command_line_.AppendSwitchASCII(switches::kWindowPosition, "invalid");
+
+  UpdateWindowBoundsAndShowStateFromCommandLine(command_line_, &bounds_,
+                                                &show_state_);
+  EXPECT_EQ(bounds_.x(), kDefaultOffsetX);
+  EXPECT_EQ(bounds_.y(), kDefaultOffsetY);
+  EXPECT_EQ(bounds_.width(), kDefaultWidth);
+  EXPECT_EQ(bounds_.height(), kDefaultHeight);
+  EXPECT_EQ(show_state_, kDefaultShowState);
+}
+
+TEST_F(BrowserWindowStateTest, WindowSizeOverridesShowState) {
+  command_line_.AppendSwitchASCII(switches::kWindowSize, "100,200");
+
+  UpdateWindowBoundsAndShowStateFromCommandLine(command_line_, &bounds_,
+                                                &show_state_);
+  EXPECT_EQ(bounds_.x(), kDefaultOffsetX);
+  EXPECT_EQ(bounds_.y(), kDefaultOffsetY);
+  EXPECT_EQ(bounds_.width(), 100);
+  EXPECT_EQ(bounds_.height(), 200);
+  EXPECT_EQ(show_state_, ui::SHOW_STATE_NORMAL);
+}
+
+TEST_F(BrowserWindowStateTest, WindowPositionOverridesShowState) {
+  command_line_.AppendSwitchASCII(switches::kWindowPosition, "100,200");
+
+  UpdateWindowBoundsAndShowStateFromCommandLine(command_line_, &bounds_,
+                                                &show_state_);
+  EXPECT_EQ(bounds_.x(), 100);
+  EXPECT_EQ(bounds_.y(), 200);
+  EXPECT_EQ(bounds_.width(), kDefaultWidth);
+  EXPECT_EQ(bounds_.height(), kDefaultHeight);
+  EXPECT_EQ(show_state_, ui::SHOW_STATE_NORMAL);
+}
+
+}  // namespace internal
+
+}  // namespace chrome