chrome/browser/ui/browser_unittest.cc - Issue 11072002: Combined window positioning and show state determiniation in the WindowSizer

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: fixed more build issues 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

« chrome/browser/prefs/pref_service_browsertest.cc ('K') | « chrome/browser/prefs/pref_service_browsertest.cc ('k') | chrome/browser/ui/browser_window_state.h » ('j') | chrome/browser/ui/window_sizer/window_sizer_common_unittest.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..91b8da084e2a92937ec9a87d2638970bd2f75355 100644

--- a/chrome/browser/ui/browser_unittest.cc

+++ b/chrome/browser/ui/browser_unittest.cc

@@ -12,21 +12,25 @@

// Various assertions around setting show state.

TEST_F(BrowserWithTestWindowTest, GetSavedWindowShowState) {

+ ui::WindowShowState show_state;

+ gfx::Rect bounds;

+ chrome::GetSavedWindowBoundsAndShowState(browser(), &bounds, &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(), &bounds, &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(), &bounds, &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(), &bounds, &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(), &bounds, &show_state);

+ EXPECT_EQ(ui::SHOW_STATE_FULLSCREEN, show_state);

}

TEST_F(BrowserWithTestWindowTest, IsReservedCommandOrKey) {