Fix: New window appears to the left/up if the taskbar is on left/top....

chrome/browser/window_sizer_unittest.cc

 // Copyright (c) 2006-2008 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 <vector>
 
 #include "chrome/browser/window_sizer.h"
 #include "base/logging.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 24 matching lines @@
 
 // Testing implementation of WindowSizer::MonitorInfoProvider that we can use
 // to fake various monitor layouts and sizes.
 class TestMonitorInfoProvider : public WindowSizer::MonitorInfoProvider {
  public:
   TestMonitorInfoProvider() {}
   virtual ~TestMonitorInfoProvider() {}
 
   void AddMonitor(const gfx::Rect& bounds, const gfx::Rect& work_area) {
     DCHECK(bounds.Contains(work_area));
-    monitor_bounds_.push_back(work_area);
+    monitor_bounds_.push_back(bounds);
     work_areas_.push_back(work_area);
   }
 
   // Overridden from WindowSizer::MonitorInfoProvider:
   virtual gfx::Rect GetPrimaryMonitorWorkArea() const {
     return work_areas_[0];
   }
 
   virtual gfx::Rect GetPrimaryMonitorBounds() const {
     return monitor_bounds_[0];
@@ skipping 103 matching lines @@
     sp->SetPersistentState(state, maximized, true);
   else if (source == LAST_ACTIVE)
     sp->SetLastActiveState(state, true);
   WindowSizer sizer(sp, mip);
   sizer.DetermineWindowBounds(gfx::Rect(), out_bounds, out_maximized);
 }
 
 // Test that the window is sized appropriately for the first run experience
 // where the default window bounds calculation is invoked.
 TEST(WindowSizerTest, DefaultSizeCase) {
-
   { // 4:3 monitor case, 1024x768, no taskbar
     gfx::Rect window_bounds;
     bool maximized;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(), gfx::Rect(),
                     false, DEFAULT, &window_bounds, &maximized);
     EXPECT_FALSE(maximized);
     EXPECT_EQ(gfx::Rect(10, 10, 1004, 748), window_bounds);
   }
 
   { // 4:3 monitor case, 1024x768, taskbar on bottom
@@ skipping 75 matching lines @@
   { // normal, in the middle of the screen somewhere.
     gfx::Rect window_bounds;
     bool maximized = false;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
                     gfx::Rect(10, 10, 500, 400), false, LAST_ACTIVE,
                     &window_bounds, &maximized);
     EXPECT_FALSE(maximized);
     EXPECT_EQ(gfx::Rect(20, 20, 500, 400), window_bounds);
   }
 
+  { // taskbar on left.
+    gfx::Rect window_bounds;
+    bool maximized = false;
+    GetWindowBounds(tentwentyfour, taskbar_left_work_area, gfx::Rect(),
+                    gfx::Rect(10, 10, 500, 400), false, LAST_ACTIVE,
+                    &window_bounds, &maximized);
+    EXPECT_FALSE(maximized);
+    EXPECT_EQ(gfx::Rect(127, 20, 500, 400), window_bounds);
+  }
+
+  { // taskbar on top.
+    gfx::Rect window_bounds;
+    bool maximized = false;
+    GetWindowBounds(tentwentyfour, taskbar_top_work_area, gfx::Rect(),
+                    gfx::Rect(10, 10, 500, 400), false, LAST_ACTIVE,
+                    &window_bounds, &maximized);
+    EXPECT_FALSE(maximized);
+    EXPECT_EQ(gfx::Rect(20, 54, 500, 400), window_bounds);
+  }
+
   { // too small to satisify the minimum visibility condition.
     gfx::Rect window_bounds;
     bool maximized = false;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
                     gfx::Rect(10, 10, 29, 29), false, LAST_ACTIVE,
                     &window_bounds, &maximized);
     EXPECT_FALSE(maximized);
     EXPECT_EQ(gfx::Rect(20, 20, 30 /* not 29 */, 30 /* not 29 */),
               window_bounds);
   }
@@ skipping 61 matching lines @@
                     gfx::Rect(985, 729, 500, 400), false, LAST_ACTIVE,
                     &window_bounds, &maximized);
     EXPECT_FALSE(maximized);
     EXPECT_EQ(gfx::Rect(994 /* not 995 */, 738 /* not 739 */, 500, 400),
               window_bounds);
   }
 }
 
 // Test that the window opened is sized appropriately given persisted sizes.
 TEST(WindowSizerTest, PersistedBoundsCase) {
-
   { // normal, in the middle of the screen somewhere.
     gfx::Rect initial_bounds(10, 10, 500, 400);
 
     gfx::Rect window_bounds;
     bool maximized;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(), initial_bounds,
                     false, PERSISTED, &window_bounds, &maximized);
     EXPECT_FALSE(maximized);
     EXPECT_EQ(initial_bounds, window_bounds);
   }
@@ skipping 29 matching lines @@
     GetWindowBounds(tentwentyfour, tentwentyfour, left_nonprimary,
                     initial_bounds, true, PERSISTED, &window_bounds,
                     &maximized);
     EXPECT_TRUE(maximized);
     EXPECT_EQ(initial_bounds, window_bounds);
   }
 
   { // off the left but the minimum visibility condition is barely satisfied
     // without relocaiton.
     gfx::Rect initial_bounds(-470, 50, 500, 400);
-    
+
     gfx::Rect window_bounds;
     bool maximized;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
                     initial_bounds, false, PERSISTED,
                     &window_bounds, &maximized);
     EXPECT_FALSE(maximized);
     EXPECT_EQ(initial_bounds, window_bounds);
   }
 
   { // off the left and the minimum visibility condition is satisfied by
@@ skipping 171 matching lines @@
     gfx::Rect window_bounds;
     bool maximized;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
                     gfx::Rect(10, 10, 29, 29), false, PERSISTED,
                     &window_bounds, &maximized);
     EXPECT_FALSE(maximized);
     EXPECT_EQ(gfx::Rect(10, 10, 30 /* not 29 */, 30 /* not 29 */),
               window_bounds);
   }
 }