diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-28 17:20:06 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-28 17:20:06 +0000 |
| commit | 170acd4d2ac0b54aa387cf1f8f046d1c096b02a8 (patch) | |
| tree | df69ed924758c9bd1185c6a5ebf59310eb33a13c /chrome/browser/sessions | |
| parent | 1d799ddcfcf7925b8fb8aeb6070f33eb5c4e0826 (diff) | |
| download | chromium_src-170acd4d2ac0b54aa387cf1f8f046d1c096b02a8.zip chromium_src-170acd4d2ac0b54aa387cf1f8f046d1c096b02a8.tar.gz chromium_src-170acd4d2ac0b54aa387cf1f8f046d1c096b02a8.tar.bz2 | |
Changes ui proxy classes to use Browser::Types rather than copying
them.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/343018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30355 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sessions')
| -rw-r--r-- | chrome/browser/sessions/session_restore_uitest.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/sessions/session_restore_uitest.cc b/chrome/browser/sessions/session_restore_uitest.cc index fd25362..90eed2d 100644 --- a/chrome/browser/sessions/session_restore_uitest.cc +++ b/chrome/browser/sessions/session_restore_uitest.cc @@ -267,7 +267,7 @@ TEST_F(SessionRestoreUITest, NormalAndPopup) { ASSERT_EQ(1, window_count); // Open a popup. - ASSERT_TRUE(automation()->OpenNewBrowserWindow(BrowserProxy::TYPE_POPUP, + ASSERT_TRUE(automation()->OpenNewBrowserWindow(Browser::TYPE_POPUP, true)); ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count)); ASSERT_EQ(2, window_count); @@ -287,17 +287,17 @@ TEST_F(SessionRestoreUITest, NormalAndPopup) { automation()->GetBrowserWindow(1)); ASSERT_TRUE(browser_proxy2.get()); - BrowserProxy::Type type1, type2; + Browser::Type type1, type2; ASSERT_TRUE(browser_proxy1->GetType(&type1)); ASSERT_TRUE(browser_proxy2->GetType(&type2)); // The order of whether the normal window or popup is first depends upon // activation order, which is not necessarily consistant across runs. - if (type1 == BrowserProxy::TYPE_NORMAL) { - EXPECT_EQ(type2, BrowserProxy::TYPE_POPUP); + if (type1 == Browser::TYPE_NORMAL) { + EXPECT_EQ(type2, Browser::TYPE_POPUP); } else { - EXPECT_EQ(type1, BrowserProxy::TYPE_POPUP); - EXPECT_EQ(type2, BrowserProxy::TYPE_NORMAL); + EXPECT_EQ(type1, Browser::TYPE_POPUP); + EXPECT_EQ(type2, Browser::TYPE_NORMAL); } } @@ -357,7 +357,7 @@ TEST_F(SessionRestoreUITest, TwoWindowsCloseOneRestoreOnlyOne) { ASSERT_EQ(1, window_count); // Open a second window. - ASSERT_TRUE(automation()->OpenNewBrowserWindow(BrowserProxy::TYPE_NORMAL, + ASSERT_TRUE(automation()->OpenNewBrowserWindow(Browser::TYPE_NORMAL, true)); ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count)); ASSERT_EQ(2, window_count); |