Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2106)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/window_sizer_unittest.cc

Issue 8584001: Remove unused "maximized" parameter from WindowSizer::GetBrowserWindowBounds(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/window_sizer.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/window_sizer_unittest.cc
diff --git a/chrome/browser/ui/window_sizer_unittest.cc b/chrome/browser/ui/window_sizer_unittest.cc
index 8532e74c5f3f0c57add60f15455f277df31cc472..ab94b40139b0796ed1da3d89c41b6068e4139e71 100644
--- a/chrome/browser/ui/window_sizer_unittest.cc
+++ b/chrome/browser/ui/window_sizer_unittest.cc
@@ -97,18 +97,15 @@ class TestMonitorInfoProvider : public WindowSizer::MonitorInfoProvider {
class TestStateProvider : public WindowSizer::StateProvider {
public:
TestStateProvider()
- : persistent_maximized_(false),
- has_persistent_data_(false),
+ : has_persistent_data_(false),
has_last_active_data_(false) {
}
virtual ~TestStateProvider() {}
void SetPersistentState(const gfx::Rect& bounds,
- bool maximized,
const gfx::Rect& work_area,
bool has_persistent_data) {
persistent_bounds_ = bounds;
- persistent_maximized_ = maximized;
persistent_work_area_ = work_area;
has_persistent_data_ = has_persistent_data;
}
@@ -120,10 +117,8 @@ class TestStateProvider : public WindowSizer::StateProvider {
// Overridden from WindowSizer::StateProvider:
virtual bool GetPersistentState(gfx::Rect* bounds,
- bool* maximized,
gfx::Rect* saved_work_area) const {
*bounds = persistent_bounds_;
- *maximized = persistent_maximized_;
*saved_work_area = persistent_work_area_;
return has_persistent_data_;
}
@@ -135,7 +130,6 @@ class TestStateProvider : public WindowSizer::StateProvider {
private:
gfx::Rect persistent_bounds_;
- bool persistent_maximized_;
gfx::Rect persistent_work_area_;
bool has_persistent_data_;
@@ -152,22 +146,20 @@ static void GetWindowBounds(const gfx::Rect& monitor1_bounds,
const gfx::Rect& monitor1_work_area,
const gfx::Rect& monitor2_bounds,
const gfx::Rect& state,
- bool maximized,
const gfx::Rect& work_area,
Source source,
- gfx::Rect* out_bounds,
- bool* out_maximized) {
+ gfx::Rect* out_bounds) {
TestMonitorInfoProvider* mip = new TestMonitorInfoProvider;
mip->AddMonitor(monitor1_bounds, monitor1_work_area);
if (!monitor2_bounds.IsEmpty())
mip->AddMonitor(monitor2_bounds, monitor2_bounds);
TestStateProvider* sp = new TestStateProvider;
if (source == PERSISTED)
- sp->SetPersistentState(state, maximized, work_area, true);
+ sp->SetPersistentState(state, work_area, true);
else if (source == LAST_ACTIVE)
sp->SetLastActiveState(state, true);
WindowSizer sizer(sp, mip);
- sizer.DetermineWindowBounds(gfx::Rect(), out_bounds, out_maximized);
+ sizer.DetermineWindowBounds(gfx::Rect(), out_bounds);
}
// Test that the window is sized appropriately for the first run experience
@@ -175,10 +167,8 @@ static void GetWindowBounds(const gfx::Rect& monitor1_bounds,
TEST(WindowSizerTest, DefaultSizeCase) {
{ // 4:3 monitor case, 1024x768, no taskbar
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(), gfx::Rect(),
- false, gfx::Rect(), DEFAULT, &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(), DEFAULT, &window_bounds);
EXPECT_EQ(gfx::Rect(kWindowTilePixels, kWindowTilePixels,
1024 - kWindowTilePixels * 2,
768 - kWindowTilePixels * 2),
@@ -187,11 +177,8 @@ TEST(WindowSizerTest, DefaultSizeCase) {
{ // 4:3 monitor case, 1024x768, taskbar on bottom
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, taskbar_bottom_work_area, gfx::Rect(),
- gfx::Rect(), false, gfx::Rect(), DEFAULT, &window_bounds,
- &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(), gfx::Rect(), DEFAULT, &window_bounds);
EXPECT_EQ(gfx::Rect(kWindowTilePixels, kWindowTilePixels,
1024 - kWindowTilePixels * 2,
(taskbar_bottom_work_area.height() -
@@ -201,11 +188,8 @@ TEST(WindowSizerTest, DefaultSizeCase) {
{ // 4:3 monitor case, 1024x768, taskbar on right
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, taskbar_right_work_area, gfx::Rect(),
- gfx::Rect(), false, gfx::Rect(), DEFAULT, &window_bounds,
- &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(), gfx::Rect(), DEFAULT, &window_bounds);
EXPECT_EQ(gfx::Rect(kWindowTilePixels, kWindowTilePixels,
taskbar_right_work_area.width() - kWindowTilePixels*2,
768 - kWindowTilePixels * 2),
@@ -214,11 +198,8 @@ TEST(WindowSizerTest, DefaultSizeCase) {
{ // 4:3 monitor case, 1024x768, taskbar on left
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, taskbar_left_work_area, gfx::Rect(),
- gfx::Rect(), false, gfx::Rect(), DEFAULT, &window_bounds,
- &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(), gfx::Rect(), DEFAULT, &window_bounds);
EXPECT_EQ(gfx::Rect(taskbar_left_work_area.x() + kWindowTilePixels,
kWindowTilePixels,
taskbar_left_work_area.width() - kWindowTilePixels * 2,
@@ -229,11 +210,8 @@ TEST(WindowSizerTest, DefaultSizeCase) {
{ // 4:3 monitor case, 1024x768, taskbar on top
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, taskbar_top_work_area, gfx::Rect(),
- gfx::Rect(), false, gfx::Rect(), DEFAULT, &window_bounds,
- &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(), gfx::Rect(), DEFAULT, &window_bounds);
EXPECT_EQ(gfx::Rect(kWindowTilePixels,
taskbar_top_work_area.y() + kWindowTilePixels,
1024 - kWindowTilePixels * 2,
@@ -243,10 +221,8 @@ TEST(WindowSizerTest, DefaultSizeCase) {
{ // 4:3 monitor case, 1280x1024
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(twelveeighty, twelveeighty, gfx::Rect(), gfx::Rect(),
- false, gfx::Rect(), DEFAULT, &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(), DEFAULT, &window_bounds);
EXPECT_EQ(gfx::Rect(kWindowTilePixels, kWindowTilePixels,
1050,
1024 - kWindowTilePixels * 2),
@@ -255,10 +231,8 @@ TEST(WindowSizerTest, DefaultSizeCase) {
{ // 4:3 monitor case, 1600x1200
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(sixteenhundred, sixteenhundred, gfx::Rect(), gfx::Rect(),
- false, gfx::Rect(), DEFAULT, &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(), DEFAULT, &window_bounds);
EXPECT_EQ(gfx::Rect(kWindowTilePixels, kWindowTilePixels,
1050,
1200 - kWindowTilePixels * 2),
@@ -267,10 +241,8 @@ TEST(WindowSizerTest, DefaultSizeCase) {
{ // 16:10 monitor case, 1680x1050
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(sixteeneighty, sixteeneighty, gfx::Rect(), gfx::Rect(),
- false, gfx::Rect(), DEFAULT, &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(), DEFAULT, &window_bounds);
EXPECT_EQ(gfx::Rect(kWindowTilePixels, kWindowTilePixels,
840 - static_cast<int>(kWindowTilePixels * 1.5),
1050 - kWindowTilePixels * 2),
@@ -279,10 +251,8 @@ TEST(WindowSizerTest, DefaultSizeCase) {
{ // 16:10 monitor case, 1920x1200
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(nineteentwenty, nineteentwenty, gfx::Rect(), gfx::Rect(),
- false, gfx::Rect(), DEFAULT, &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(), DEFAULT, &window_bounds);
EXPECT_EQ(gfx::Rect(kWindowTilePixels, kWindowTilePixels,
960 - static_cast<int>(kWindowTilePixels * 1.5),
1200 - kWindowTilePixels * 2),
@@ -295,38 +265,29 @@ TEST(WindowSizerTest, DefaultSizeCase) {
TEST(WindowSizerTest, LastWindowBoundsCase) {
{ // normal, in the middle of the screen somewhere.
gfx::Rect window_bounds;
- bool maximized = false;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
gfx::Rect(kWindowTilePixels, kWindowTilePixels, 500, 400),
- false, gfx::Rect(), LAST_ACTIVE,
- &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(), LAST_ACTIVE, &window_bounds);
EXPECT_EQ(gfx::Rect(kWindowTilePixels * 2,
kWindowTilePixels * 2, 500, 400), window_bounds);
}
{ // taskbar on top.
gfx::Rect window_bounds;
- bool maximized = false;
GetWindowBounds(tentwentyfour, taskbar_top_work_area, gfx::Rect(),
gfx::Rect(kWindowTilePixels, kWindowTilePixels, 500, 400),
- false, gfx::Rect(), LAST_ACTIVE,
- &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(), LAST_ACTIVE, &window_bounds);
EXPECT_EQ(gfx::Rect(kWindowTilePixels * 2,
std::max(kWindowTilePixels * 2,
34 /* toolbar height */),
500, 400), window_bounds);
}
- { // too small to satisify the minimum visibility condition.
+ { // Too small to satisify the minimum visibility condition.
gfx::Rect window_bounds;
- bool maximized = false;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
gfx::Rect(kWindowTilePixels, kWindowTilePixels, 29, 29),
- false, gfx::Rect(), LAST_ACTIVE,
- &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(), LAST_ACTIVE, &window_bounds);
EXPECT_EQ(gfx::Rect(kWindowTilePixels * 2,
kWindowTilePixels * 2,
30 /* not 29 */,
@@ -335,14 +296,11 @@ TEST(WindowSizerTest, LastWindowBoundsCase) {
}
- { // normal, but maximized
+ { // Normal.
gfx::Rect window_bounds;
- bool maximized = false;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
gfx::Rect(kWindowTilePixels, kWindowTilePixels, 500, 400),
- true, gfx::Rect(), LAST_ACTIVE,
- &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(), LAST_ACTIVE, &window_bounds);
EXPECT_EQ(gfx::Rect(kWindowTilePixels * 2,
kWindowTilePixels * 2, 500, 400), window_bounds);
}
@@ -354,21 +312,17 @@ TEST(WindowSizerTest, PersistedBoundsCase) {
gfx::Rect initial_bounds(kWindowTilePixels, kWindowTilePixels, 500, 400);
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(), initial_bounds,
- false, gfx::Rect(), PERSISTED, &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(), PERSISTED, &window_bounds);
EXPECT_EQ(initial_bounds, window_bounds);
}
- { // normal, maximized.
+ { // Normal.
gfx::Rect initial_bounds(0, 0, 1024, 768);
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(), initial_bounds,
- true, gfx::Rect(), PERSISTED, &window_bounds, &maximized);
- EXPECT_TRUE(maximized);
+ gfx::Rect(), PERSISTED, &window_bounds);
EXPECT_EQ(initial_bounds, window_bounds);
}
@@ -376,23 +330,17 @@ TEST(WindowSizerTest, PersistedBoundsCase) {
gfx::Rect initial_bounds(-600, 10, 500, 400);
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, tentwentyfour, left_nonprimary,
- initial_bounds, false, gfx::Rect(), PERSISTED,
- &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ initial_bounds, gfx::Rect(), PERSISTED, &window_bounds);
EXPECT_EQ(initial_bounds, window_bounds);
}
- { // normal, on non-primary monitor in negative coords, maximized.
+ { // normal, on non-primary monitor in negative coords.
gfx::Rect initial_bounds(-1024, 0, 1024, 768);
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, tentwentyfour, left_nonprimary,
- initial_bounds, true, gfx::Rect(), PERSISTED,
- &window_bounds, &maximized);
- EXPECT_TRUE(maximized);
+ initial_bounds, gfx::Rect(), PERSISTED, &window_bounds);
EXPECT_EQ(initial_bounds, window_bounds);
}
@@ -402,11 +350,9 @@ TEST(WindowSizerTest, PersistedBoundsCase) {
gfx::Rect initial_bounds(1074, 50, 600, 500);
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(1024, 0, 800, 600),
- initial_bounds, false, right_nonprimary,
- PERSISTED, &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ initial_bounds, right_nonprimary, PERSISTED,
+ &window_bounds);
EXPECT_EQ(initial_bounds, window_bounds);
}
@@ -416,11 +362,9 @@ TEST(WindowSizerTest, PersistedBoundsCase) {
gfx::Rect initial_bounds(1274, 50, 600, 500);
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(1024, 0, 800, 600),
- initial_bounds, false, right_nonprimary,
- PERSISTED, &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ initial_bounds, right_nonprimary, PERSISTED,
+ &window_bounds);
EXPECT_EQ(gfx::Rect(1224, 50, 600, 500), window_bounds);
}
@@ -430,22 +374,17 @@ TEST(WindowSizerTest, PersistedBoundsCase) {
gfx::Rect initial_bounds(1274, 50, 900, 700);
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(1024, 0, 800, 600),
- initial_bounds, false, right_nonprimary,
- PERSISTED, &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ initial_bounds, right_nonprimary, PERSISTED,
+ &window_bounds);
EXPECT_EQ(gfx::Rect(1024, 0, 800, 600), window_bounds);
}
{ // width and height too small
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
gfx::Rect(kWindowTilePixels, kWindowTilePixels, 29, 29),
- false, gfx::Rect(), PERSISTED,
- &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(), PERSISTED, &window_bounds);
EXPECT_EQ(gfx::Rect(kWindowTilePixels, kWindowTilePixels,
30 /* not 29 */, 30 /* not 29 */),
window_bounds);
@@ -457,12 +396,9 @@ TEST(WindowSizerTest, PersistedBoundsCase) {
// be moved higher than the menubar. (Perhaps the user changed
// resolution to something smaller before relaunching Chrome?)
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
gfx::Rect(kWindowTilePixels, kWindowTilePixels, 30, 5000),
- false, gfx::Rect(), PERSISTED,
- &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(), PERSISTED, &window_bounds);
EXPECT_EQ(tentwentyfour.height(), window_bounds.height());
}
#endif // defined(OS_MACOSX)
@@ -479,23 +415,18 @@ TEST(WindowSizerTest, LastWindowOffscreenWithAggressiveRepositioning) {
{ // taskbar on left. The new window overlaps slightly with the taskbar, so
// it is moved to be flush with the left edge of the work area.
gfx::Rect window_bounds;
- bool maximized = false;
GetWindowBounds(tentwentyfour, taskbar_left_work_area, gfx::Rect(),
gfx::Rect(kWindowTilePixels, kWindowTilePixels, 500, 400),
- false, gfx::Rect(), LAST_ACTIVE,
- &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(), LAST_ACTIVE, &window_bounds);
EXPECT_EQ(gfx::Rect(taskbar_left_work_area.x(),
kWindowTilePixels * 2, 500, 400), window_bounds);
}
{ // offset would put the new window offscreen at the bottom
gfx::Rect window_bounds;
- bool maximized = false;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
- gfx::Rect(10, 729, 500, 400), false, gfx::Rect(),
- LAST_ACTIVE, &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(10, 729, 500, 400), gfx::Rect(), LAST_ACTIVE,
+ &window_bounds);
EXPECT_EQ(gfx::Rect(10 + kWindowTilePixels,
0 /* not 729 + kWindowTilePixels */,
500, 400),
@@ -504,11 +435,9 @@ TEST(WindowSizerTest, LastWindowOffscreenWithAggressiveRepositioning) {
{ // offset would put the new window offscreen at the right
gfx::Rect window_bounds;
- bool maximized = false;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
- gfx::Rect(985, 10, 500, 400), false, gfx::Rect(),
- LAST_ACTIVE, &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(985, 10, 500, 400), gfx::Rect(), LAST_ACTIVE,
+ &window_bounds);
EXPECT_EQ(gfx::Rect(0 /* not 985 + kWindowTilePixels*/,
10 + kWindowTilePixels,
500, 400),
@@ -517,11 +446,9 @@ TEST(WindowSizerTest, LastWindowOffscreenWithAggressiveRepositioning) {
{ // offset would put the new window offscreen at the bottom right
gfx::Rect window_bounds;
- bool maximized = false;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
- gfx::Rect(985, 729, 500, 400), false, gfx::Rect(),
- LAST_ACTIVE, &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(985, 729, 500, 400), gfx::Rect(), LAST_ACTIVE,
+ &window_bounds);
EXPECT_EQ(gfx::Rect(0 /* not 985 + kWindowTilePixels*/,
0 /* not 729 + kWindowTilePixels*/,
500, 400),
@@ -532,175 +459,141 @@ TEST(WindowSizerTest, LastWindowOffscreenWithAggressiveRepositioning) {
TEST(WindowSizerTest, PersistedWindowOffscreenWithAggressiveRepositioning) {
{ // off the left
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
- gfx::Rect(-471, 50, 500, 400), false, gfx::Rect(),
- PERSISTED, &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(-471, 50, 500, 400), gfx::Rect(), PERSISTED,
+ &window_bounds);
EXPECT_EQ(gfx::Rect(0 /* not -471 */, 50, 500, 400), window_bounds);
}
{ // off the top
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
- gfx::Rect(50, -370, 500, 400), false, gfx::Rect(),
- PERSISTED, &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(50, -370, 500, 400), gfx::Rect(), PERSISTED,
+ &window_bounds);
EXPECT_EQ(gfx::Rect(50, 0, 500, 400), window_bounds);
}
{ // off the right
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
- gfx::Rect(995, 50, 500, 400), false, gfx::Rect(),
- PERSISTED, &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(995, 50, 500, 400), gfx::Rect(), PERSISTED,
+ &window_bounds);
EXPECT_EQ(gfx::Rect(0 /* not 995 */, 50, 500, 400), window_bounds);
}
{ // off the bottom
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
- gfx::Rect(50, 739, 500, 400), false, gfx::Rect(), PERSISTED,
- &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(50, 739, 500, 400), gfx::Rect(), PERSISTED,
+ &window_bounds);
EXPECT_EQ(gfx::Rect(50, 0 /* not 739 */, 500, 400), window_bounds);
}
{ // off the topleft
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
- gfx::Rect(-471, -371, 500, 400), false, gfx::Rect(),
- PERSISTED, &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(-471, -371, 500, 400), gfx::Rect(), PERSISTED,
+ &window_bounds);
EXPECT_EQ(gfx::Rect(0 /* not -471 */, 0 /* not -371 */, 500, 400),
window_bounds);
}
{ // off the topright
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
- gfx::Rect(995, -371, 500, 400), false, gfx::Rect(),
- PERSISTED, &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(995, -371, 500, 400), gfx::Rect(), PERSISTED,
+ &window_bounds);
EXPECT_EQ(gfx::Rect(0 /* not 995 */, 0 /* not -371 */, 500, 400),
window_bounds);
}
{ // off the bottomleft
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
- gfx::Rect(-471, 739, 500, 400), false, gfx::Rect(),
- PERSISTED, &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(-471, 739, 500, 400), gfx::Rect(), PERSISTED,
+ &window_bounds);
EXPECT_EQ(gfx::Rect(0 /* not -471 */, 0 /* not 739 */, 500, 400),
window_bounds);
}
{ // off the bottomright
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
- gfx::Rect(995, 739, 500, 400), false, gfx::Rect(),
- PERSISTED, &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(995, 739, 500, 400), gfx::Rect(), PERSISTED,
+ &window_bounds);
EXPECT_EQ(gfx::Rect(0 /* not 995 */, 0 /* not 739 */, 500, 400),
window_bounds);
}
{ // entirely off left
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
- gfx::Rect(-700, 50, 500, 400), false, gfx::Rect(),
- PERSISTED, &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(-700, 50, 500, 400), gfx::Rect(), PERSISTED,
+ &window_bounds);
EXPECT_EQ(gfx::Rect(0 /* not -700 */, 50, 500, 400), window_bounds);
}
{ // entirely off left (monitor was detached since last run)
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
- gfx::Rect(-700, 50, 500, 400), false, left_nonprimary,
- PERSISTED, &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(-700, 50, 500, 400), left_nonprimary,
+ PERSISTED, &window_bounds);
EXPECT_EQ(gfx::Rect(0, 50, 500, 400), window_bounds);
}
{ // entirely off top
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
- gfx::Rect(50, -500, 500, 400), false, gfx::Rect(),
- PERSISTED, &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(50, -500, 500, 400), gfx::Rect(), PERSISTED,
+ &window_bounds);
EXPECT_EQ(gfx::Rect(50, 0, 500, 400), window_bounds);
}
{ // entirely off top (monitor was detached since last run)
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
- gfx::Rect(50, -500, 500, 400), false, top_nonprimary,
- PERSISTED, &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(50, -500, 500, 400), top_nonprimary, PERSISTED,
+ &window_bounds);
EXPECT_EQ(gfx::Rect(50, 0, 500, 400), window_bounds);
}
{ // entirely off right
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
- gfx::Rect(1200, 50, 500, 400), false, gfx::Rect(),
- PERSISTED, &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(1200, 50, 500, 400), gfx::Rect(), PERSISTED,
+ &window_bounds);
EXPECT_EQ(gfx::Rect(0 /* not 1200 */, 50, 500, 400), window_bounds);
}
{ // entirely off right (monitor was detached since last run)
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
- gfx::Rect(1200, 50, 500, 400), false, right_nonprimary,
- PERSISTED, &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(1200, 50, 500, 400), right_nonprimary, PERSISTED,
+ &window_bounds);
EXPECT_EQ(gfx::Rect(524 /* not 1200 */, 50, 500, 400), window_bounds);
}
{ // entirely off bottom
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
- gfx::Rect(50, 800, 500, 400), false, gfx::Rect(), PERSISTED,
- &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(50, 800, 500, 400), gfx::Rect(), PERSISTED,
+ &window_bounds);
EXPECT_EQ(gfx::Rect(50, 0 /* not 800 */, 500, 400), window_bounds);
}
{ // entirely off bottom (monitor was detached since last run)
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
- gfx::Rect(50, 800, 500, 400), false, bottom_nonprimary,
- PERSISTED, &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(50, 800, 500, 400), bottom_nonprimary,
+ PERSISTED, &window_bounds);
EXPECT_EQ(gfx::Rect(50, 368 /* not 800 */, 500, 400), window_bounds);
}
{ // wider than the screen. off both the left and right
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
- gfx::Rect(-100, 50, 2000, 400), false, gfx::Rect(),
- PERSISTED, &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(-100, 50, 2000, 400), gfx::Rect(), PERSISTED,
+ &window_bounds);
EXPECT_EQ(gfx::Rect(0 /* not -100 */, 50, 2000, 400), window_bounds);
}
}
@@ -708,12 +601,9 @@ TEST(WindowSizerTest, PersistedWindowOffscreenWithAggressiveRepositioning) {
TEST(WindowSizerTest, LastWindowOffscreenWithNonAggressiveRepositioning) {
{ // taskbar on left.
gfx::Rect window_bounds;
- bool maximized = false;
GetWindowBounds(tentwentyfour, taskbar_left_work_area, gfx::Rect(),
gfx::Rect(kWindowTilePixels, kWindowTilePixels, 500, 400),
- false, gfx::Rect(), LAST_ACTIVE,
- &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(), LAST_ACTIVE, &window_bounds);
EXPECT_EQ(gfx::Rect(kWindowTilePixels * 2,
kWindowTilePixels * 2, 500, 400), window_bounds);
}
@@ -723,11 +613,9 @@ TEST(WindowSizerTest, LastWindowOffscreenWithNonAggressiveRepositioning) {
{ // offset would put the new window offscreen at the bottom but the minimum
// visibility condition is barely satisfied without relocation.
gfx::Rect window_bounds;
- bool maximized = false;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
- gfx::Rect(10, 728, 500, 400), false, gfx::Rect(),
- LAST_ACTIVE, &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(10, 728, 500, 400), gfx::Rect(), LAST_ACTIVE,
+ &window_bounds);
EXPECT_EQ(gfx::Rect(10 + kWindowTilePixels, 738,
500, 400), window_bounds);
}
@@ -735,11 +623,9 @@ TEST(WindowSizerTest, LastWindowOffscreenWithNonAggressiveRepositioning) {
{ // offset would put the new window offscreen at the bottom and the minimum
// visibility condition is satisified by relocation.
gfx::Rect window_bounds;
- bool maximized = false;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
- gfx::Rect(10, 729, 500, 400), false, gfx::Rect(),
- LAST_ACTIVE, &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(10, 729, 500, 400), gfx::Rect(), LAST_ACTIVE,
+ &window_bounds);
EXPECT_EQ(gfx::Rect(10 + kWindowTilePixels, 738 /* not 739 */, 500, 400),
window_bounds);
}
@@ -747,22 +633,18 @@ TEST(WindowSizerTest, LastWindowOffscreenWithNonAggressiveRepositioning) {
{ // offset would put the new window offscreen at the right but the minimum
// visibility condition is barely satisfied without relocation.
gfx::Rect window_bounds;
- bool maximized = false;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
- gfx::Rect(984, 10, 500, 400), false, gfx::Rect(),
- LAST_ACTIVE, &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(984, 10, 500, 400), gfx::Rect(), LAST_ACTIVE,
+ &window_bounds);
EXPECT_EQ(gfx::Rect(994, 10 + kWindowTilePixels, 500, 400), window_bounds);
}
{ // offset would put the new window offscreen at the right and the minimum
// visibility condition is satisified by relocation.
gfx::Rect window_bounds;
- bool maximized = false;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
- gfx::Rect(985, 10, 500, 400), false, gfx::Rect(),
- LAST_ACTIVE, &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(985, 10, 500, 400), gfx::Rect(), LAST_ACTIVE,
+ &window_bounds);
EXPECT_EQ(gfx::Rect(994 /* not 995 */, 10 + kWindowTilePixels,
500, 400), window_bounds);
}
@@ -770,11 +652,9 @@ TEST(WindowSizerTest, LastWindowOffscreenWithNonAggressiveRepositioning) {
{ // offset would put the new window offscreen at the bottom right and the
// minimum visibility condition is satisified by relocation.
gfx::Rect window_bounds;
- bool maximized = false;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
- gfx::Rect(985, 729, 500, 400), false, gfx::Rect(),
- LAST_ACTIVE, &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(985, 729, 500, 400), gfx::Rect(), LAST_ACTIVE,
+ &window_bounds);
EXPECT_EQ(gfx::Rect(994 /* not 995 */, 738 /* not 739 */, 500, 400),
window_bounds);
}
@@ -787,22 +667,18 @@ TEST(WindowSizerTest, PersistedWindowOffscreenWithNonAggressiveRepositioning) {
gfx::Rect initial_bounds(-470, 50, 500, 400);
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
- initial_bounds, false, gfx::Rect(), PERSISTED,
- &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ initial_bounds, gfx::Rect(), PERSISTED,
+ &window_bounds);
EXPECT_EQ(initial_bounds, window_bounds);
}
{ // off the left and the minimum visibility condition is satisfied by
// relocation.
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
- gfx::Rect(-471, 50, 500, 400), false, gfx::Rect(),
- PERSISTED, &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(-471, 50, 500, 400), gfx::Rect(), PERSISTED,
+ &window_bounds);
EXPECT_EQ(gfx::Rect(-470 /* not -471 */, 50, 500, 400), window_bounds);
}
@@ -810,11 +686,9 @@ TEST(WindowSizerTest, PersistedWindowOffscreenWithNonAggressiveRepositioning) {
gfx::Rect initial_bounds(50, -370, 500, 400);
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
- gfx::Rect(50, -370, 500, 400), false, gfx::Rect(),
- PERSISTED, &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(50, -370, 500, 400), gfx::Rect(), PERSISTED,
+ &window_bounds);
EXPECT_EQ(gfx::Rect(50, 0, 500, 400), window_bounds);
}
@@ -823,22 +697,18 @@ TEST(WindowSizerTest, PersistedWindowOffscreenWithNonAggressiveRepositioning) {
gfx::Rect initial_bounds(994, 50, 500, 400);
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
- initial_bounds, false, gfx::Rect(), PERSISTED,
- &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ initial_bounds, gfx::Rect(), PERSISTED,
+ &window_bounds);
EXPECT_EQ(initial_bounds, window_bounds);
}
{ // off the right and the minimum visibility condition is satisified by
// relocation.
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
- gfx::Rect(995, 50, 500, 400), false, gfx::Rect(),
- PERSISTED, &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(995, 50, 500, 400), gfx::Rect(), PERSISTED,
+ &window_bounds);
EXPECT_EQ(gfx::Rect(994 /* not 995 */, 50, 500, 400), window_bounds);
}
@@ -847,32 +717,26 @@ TEST(WindowSizerTest, PersistedWindowOffscreenWithNonAggressiveRepositioning) {
gfx::Rect initial_bounds(50, 738, 500, 400);
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
- initial_bounds, false, gfx::Rect(), PERSISTED,
- &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ initial_bounds, gfx::Rect(), PERSISTED,
+ &window_bounds);
EXPECT_EQ(initial_bounds, window_bounds);
}
{ // off the bottom and the minimum visibility condition is satisified by
// relocation.
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
- gfx::Rect(50, 739, 500, 400), false, gfx::Rect(), PERSISTED,
- &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(50, 739, 500, 400), gfx::Rect(), PERSISTED,
+ &window_bounds);
EXPECT_EQ(gfx::Rect(50, 738 /* not 739 */, 500, 400), window_bounds);
}
{ // off the topleft
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
- gfx::Rect(-471, -371, 500, 400), false, gfx::Rect(),
- PERSISTED, &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(-471, -371, 500, 400), gfx::Rect(), PERSISTED,
+ &window_bounds);
EXPECT_EQ(gfx::Rect(-470 /* not -471 */, 0, 500, 400),
window_bounds);
}
@@ -880,11 +744,9 @@ TEST(WindowSizerTest, PersistedWindowOffscreenWithNonAggressiveRepositioning) {
{ // off the topright and the minimum visibility condition is satisified by
// relocation.
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
- gfx::Rect(995, -371, 500, 400), false, gfx::Rect(),
- PERSISTED, &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(995, -371, 500, 400), gfx::Rect(), PERSISTED,
+ &window_bounds);
EXPECT_EQ(gfx::Rect(994 /* not 995 */, 0, 500, 400),
window_bounds);
}
@@ -892,11 +754,9 @@ TEST(WindowSizerTest, PersistedWindowOffscreenWithNonAggressiveRepositioning) {
{ // off the bottomleft and the minimum visibility condition is satisified by
// relocation.
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
- gfx::Rect(-471, 739, 500, 400), false, gfx::Rect(),
- PERSISTED, &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(-471, 739, 500, 400), gfx::Rect(), PERSISTED,
+ &window_bounds);
EXPECT_EQ(gfx::Rect(-470 /* not -471 */, 738 /* not 739 */, 500, 400),
window_bounds);
}
@@ -904,92 +764,74 @@ TEST(WindowSizerTest, PersistedWindowOffscreenWithNonAggressiveRepositioning) {
{ // off the bottomright and the minimum visibility condition is satisified by
// relocation.
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
- gfx::Rect(995, 739, 500, 400), false, gfx::Rect(),
- PERSISTED, &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(995, 739, 500, 400), gfx::Rect(), PERSISTED,
+ &window_bounds);
EXPECT_EQ(gfx::Rect(994 /* not 995 */, 738 /* not 739 */, 500, 400),
window_bounds);
}
{ // entirely off left
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
- gfx::Rect(-700, 50, 500, 400), false, gfx::Rect(),
- PERSISTED, &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(-700, 50, 500, 400), gfx::Rect(), PERSISTED,
+ &window_bounds);
EXPECT_EQ(gfx::Rect(-470 /* not -700 */, 50, 500, 400), window_bounds);
}
{ // entirely off left (monitor was detached since last run)
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
- gfx::Rect(-700, 50, 500, 400), false, left_nonprimary,
- PERSISTED, &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(-700, 50, 500, 400), left_nonprimary, PERSISTED,
+ &window_bounds);
EXPECT_EQ(gfx::Rect(0, 50, 500, 400), window_bounds);
}
{ // entirely off top
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
- gfx::Rect(50, -500, 500, 400), false, gfx::Rect(),
- PERSISTED, &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(50, -500, 500, 400), gfx::Rect(), PERSISTED,
+ &window_bounds);
EXPECT_EQ(gfx::Rect(50, 0, 500, 400), window_bounds);
}
{ // entirely off top (monitor was detached since last run)
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
- gfx::Rect(50, -500, 500, 400), false, top_nonprimary,
- PERSISTED, &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(50, -500, 500, 400), top_nonprimary,
+ PERSISTED, &window_bounds);
EXPECT_EQ(gfx::Rect(50, 0, 500, 400), window_bounds);
}
{ // entirely off right
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
- gfx::Rect(1200, 50, 500, 400), false, gfx::Rect(),
- PERSISTED, &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(1200, 50, 500, 400), gfx::Rect(), PERSISTED,
+ &window_bounds);
EXPECT_EQ(gfx::Rect(994 /* not 1200 */, 50, 500, 400), window_bounds);
}
{ // entirely off right (monitor was detached since last run)
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
- gfx::Rect(1200, 50, 500, 400), false, right_nonprimary,
- PERSISTED, &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(1200, 50, 500, 400), right_nonprimary,
+ PERSISTED, &window_bounds);
EXPECT_EQ(gfx::Rect(524, 50, 500, 400), window_bounds);
}
{ // entirely off bottom
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
- gfx::Rect(50, 800, 500, 400), false, gfx::Rect(), PERSISTED,
- &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(50, 800, 500, 400), gfx::Rect(), PERSISTED,
+ &window_bounds);
EXPECT_EQ(gfx::Rect(50, 738 /* not 800 */, 500, 400), window_bounds);
}
{ // entirely off bottom (monitor was detached since last run)
gfx::Rect window_bounds;
- bool maximized;
GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
- gfx::Rect(50, 800, 500, 400), false, bottom_nonprimary,
- PERSISTED, &window_bounds, &maximized);
- EXPECT_FALSE(maximized);
+ gfx::Rect(50, 800, 500, 400), bottom_nonprimary,
+ PERSISTED, &window_bounds);
EXPECT_EQ(gfx::Rect(50, 368, 500, 400), window_bounds);
}
}
« no previous file with comments | « chrome/browser/ui/window_sizer.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698