summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_browsertest.cc
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-16 00:22:48 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-16 00:22:48 +0000
commitd83a560943d1fdfcf9ec46ea001248a46e6148a7 (patch)
treec046a2757bbeb25c42f2f6af300cd4098289c715 /chrome/browser/browser_browsertest.cc
parent63692215e10b693db53a395a9fdefd77cf3a6fc6 (diff)
downloadchromium_src-d83a560943d1fdfcf9ec46ea001248a46e6148a7.zip
chromium_src-d83a560943d1fdfcf9ec46ea001248a46e6148a7.tar.gz
chromium_src-d83a560943d1fdfcf9ec46ea001248a46e6148a7.tar.bz2
FBTF: Move Extension::LaunchContainer to extension_constants.h.
This makes browser.h not depend on extension.h. BUG=none TEST=compiles Review URL: http://codereview.chromium.org/3399008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59588 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_browsertest.cc')
-rw-r--r--chrome/browser/browser_browsertest.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/browser_browsertest.cc b/chrome/browser/browser_browsertest.cc
index 23b998d..e188cce 100644
--- a/chrome/browser/browser_browsertest.cc
+++ b/chrome/browser/browser_browsertest.cc
@@ -702,7 +702,8 @@ IN_PROC_BROWSER_TEST_F(BrowserAppRefocusTest, MAYBE_OpenTab) {
Browser* second_browser = CreateBrowser(profile_);
second_browser->window()->Show();
- Browser::OpenApplication(profile_, extension_app_, Extension::LAUNCH_TAB);
+ Browser::OpenApplication(profile_, extension_app_,
+ extension_misc::LAUNCH_TAB);
ASSERT_EQ(2, second_browser->tab_count()) <<
"Expect the app to open in a tab under |second_browser|.";
int second_app_tab_index = second_browser->selected_index();
@@ -719,7 +720,7 @@ IN_PROC_BROWSER_TEST_F(BrowserAppRefocusTest, MAYBE_OpenPanel) {
// Open the app in a panel.
Browser::OpenApplicationWindow(profile_, extension_app_,
- Extension::LAUNCH_PANEL, GURL(), NULL);
+ extension_misc::LAUNCH_PANEL, GURL(), NULL);
Browser* app_panel = BrowserList::GetLastActive();
ASSERT_TRUE(app_panel);
ASSERT_NE(app_panel, browser()) << "New browser should have opened.";
@@ -760,7 +761,7 @@ IN_PROC_BROWSER_TEST_F(BrowserAppRefocusTest, MAYBE_PanelBeforeTab) {
// Open a panel with the app.
Browser::OpenApplicationWindow(profile_, extension_app_,
- Extension::LAUNCH_PANEL, GURL(), NULL);
+ extension_misc::LAUNCH_PANEL, GURL(), NULL);
Browser* app_panel = BrowserList::GetLastActive();
ASSERT_TRUE(app_panel);
ASSERT_NE(app_panel, browser()) << "New browser should have opened.";