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

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

Issue 11072002: Combined window positioning and show state determiniation in the WindowSizer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 months 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
Index: chrome/browser/ui/browser_unittest.cc
diff --git a/chrome/browser/ui/browser_unittest.cc b/chrome/browser/ui/browser_unittest.cc
index 5802e77146878b3f835ad08310d5f7518c9c3ca8..cc4fcfb5523cc8235911091333697349c530c5f5 100644
--- a/chrome/browser/ui/browser_unittest.cc
+++ b/chrome/browser/ui/browser_unittest.cc
@@ -12,21 +12,24 @@
// Various assertions around setting show state.
TEST_F(BrowserWithTestWindowTest, GetSavedWindowShowState) {
+ ui::WindowShowState show_state;
+ chrome::GetSavedWindowBoundsAndShowState(browser(), show_state);
// Default show state is SHOW_STATE_DEFAULT.
- EXPECT_EQ(ui::SHOW_STATE_DEFAULT, chrome::GetSavedWindowShowState(browser()));
+ EXPECT_EQ(ui::SHOW_STATE_DEFAULT, show_state);
// Explicitly specifying a state should stick though.
browser()->set_initial_show_state(ui::SHOW_STATE_MAXIMIZED);
- EXPECT_EQ(ui::SHOW_STATE_MAXIMIZED,
- chrome::GetSavedWindowShowState(browser()));
+ chrome::GetSavedWindowBoundsAndShowState(browser(), show_state);
+ EXPECT_EQ(ui::SHOW_STATE_MAXIMIZED, show_state);
browser()->set_initial_show_state(ui::SHOW_STATE_NORMAL);
- EXPECT_EQ(ui::SHOW_STATE_NORMAL, chrome::GetSavedWindowShowState(browser()));
+ chrome::GetSavedWindowBoundsAndShowState(browser(), show_state);
+ EXPECT_EQ(ui::SHOW_STATE_NORMAL, show_state);
browser()->set_initial_show_state(ui::SHOW_STATE_MINIMIZED);
- EXPECT_EQ(ui::SHOW_STATE_MINIMIZED,
- chrome::GetSavedWindowShowState(browser()));
+ chrome::GetSavedWindowBoundsAndShowState(browser(), show_state);
+ EXPECT_EQ(ui::SHOW_STATE_MINIMIZED, show_state);
browser()->set_initial_show_state(ui::SHOW_STATE_FULLSCREEN);
- EXPECT_EQ(ui::SHOW_STATE_FULLSCREEN,
- chrome::GetSavedWindowShowState(browser()));
+ chrome::GetSavedWindowBoundsAndShowState(browser(), show_state);
+ EXPECT_EQ(ui::SHOW_STATE_FULLSCREEN, show_state);
}
TEST_F(BrowserWithTestWindowTest, IsReservedCommandOrKey) {

Powered by Google App Engine
This is Rietveld 408576698