diff options
author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-24 19:32:28 +0000 |
---|---|---|
committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-24 19:32:28 +0000 |
commit | 90e76c6d9e254b1faec975adf097ff2d888840c0 (patch) | |
tree | 2ff4a6db80e41619c4452db3713f83f3c22ac885 /chrome/browser/browser_browsertest.cc | |
parent | d3002235bebf6df780b2425b1fb7606e0c033974 (diff) | |
download | chromium_src-90e76c6d9e254b1faec975adf097ff2d888840c0.zip chromium_src-90e76c6d9e254b1faec975adf097ff2d888840c0.tar.gz chromium_src-90e76c6d9e254b1faec975adf097ff2d888840c0.tar.bz2 |
Moves Browser::AddTypes to TabStripModel. This patch is primarily
cleanup before I fix 29933, but has a couple of interesting bits
beyond the enum change:
. AddTabContents now supports adding pinned.
. Nuked duplicate code in Browser::addTabWithURL that invoked
wasHidden on the TabContents. This code is already in TabStripModel.
. Moved code for setting visibility of tabcontents from
TabStripModel::AddTabContents to InsertTabContentsAt. Since everything
ends up in InsertTabContentsAt it should be there.
. Converted InsertTabContents call in extensionstabmodule to pass in
nothing (Rafael said old code was wrong).
BUG=29933
TEST=none
Review URL: http://codereview.chromium.org/2863021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50752 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_browsertest.cc')
-rw-r--r-- | chrome/browser/browser_browsertest.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/chrome/browser/browser_browsertest.cc b/chrome/browser/browser_browsertest.cc index 4d4773c..a4bfaf9 100644 --- a/chrome/browser/browser_browsertest.cc +++ b/chrome/browser/browser_browsertest.cc @@ -113,7 +113,7 @@ class BrowserTest : public ExtensionBrowserTest { MSG_ROUTING_NONE, NULL); app_contents->SetExtensionApp(extension_app); - model->AddTabContents(app_contents, 0, false, 0, false); + model->AddTabContents(app_contents, 0, 0, TabStripModel::ADD_NONE); model->SetTabPinned(0, true); ui_test_utils::NavigateToURL(browser(), url); @@ -206,8 +206,8 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_JavascriptAlertActivatesTab) { GURL url(ui_test_utils::GetTestUrl(FilePath(FilePath::kCurrentDirectory), FilePath(kTitle1File))); ui_test_utils::NavigateToURL(browser(), url); - browser()->AddTabWithURL(url, GURL(), PageTransition::TYPED, - 0, Browser::ADD_SELECTED, NULL, std::string()); + browser()->AddTabWithURL(url, GURL(), PageTransition::TYPED, 0, + TabStripModel::ADD_SELECTED, NULL, std::string()); EXPECT_EQ(2, browser()->tab_count()); EXPECT_EQ(0, browser()->selected_index()); TabContents* second_tab = browser()->GetTabContentsAt(1); @@ -238,8 +238,8 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_ThirtyFourTabs) { // There is one initial tab. for (int ix = 0; ix != 33; ++ix) { - browser()->AddTabWithURL(url, GURL(), PageTransition::TYPED, - 0, Browser::ADD_SELECTED, NULL, std::string()); + browser()->AddTabWithURL(url, GURL(), PageTransition::TYPED, 0, + TabStripModel::ADD_SELECTED, NULL, std::string()); } EXPECT_EQ(34, browser()->tab_count()); @@ -473,7 +473,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, TabClosingWhenRemovingExtension) { MSG_ROUTING_NONE, NULL); app_contents->SetExtensionApp(extension_app); - model->AddTabContents(app_contents, 0, false, 0, false); + model->AddTabContents(app_contents, 0, 0, TabStripModel::ADD_NONE); model->SetTabPinned(0, true); ui_test_utils::NavigateToURL(browser(), url); @@ -571,7 +571,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, RestorePinnedTabs) { TabContents* app_contents = new TabContents(browser()->profile(), NULL, MSG_ROUTING_NONE, NULL); app_contents->SetExtensionApp(extension_app); - model->AddTabContents(app_contents, 0, false, 0, false); + model->AddTabContents(app_contents, 0, 0, TabStripModel::ADD_NONE); model->SetTabPinned(0, true); ui_test_utils::NavigateToURL(browser(), url); @@ -928,7 +928,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest2, NoTabsInPopups) { // Now try opening another tab in the popup browser. popup_browser->AddTabWithURL( GURL(chrome::kAboutBlankURL), GURL(), PageTransition::TYPED, -1, - Browser::ADD_SELECTED, NULL, std::string()); + TabStripModel::ADD_SELECTED, NULL, std::string()); // The popup should still only have one tab. EXPECT_EQ(1, popup_browser->tab_count()); @@ -945,7 +945,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest2, NoTabsInPopups) { // Now try opening another tab in the app browser. app_browser->AddTabWithURL( GURL(chrome::kAboutBlankURL), GURL(), PageTransition::TYPED, -1, - Browser::ADD_SELECTED, NULL, std::string()); + TabStripModel::ADD_SELECTED, NULL, std::string()); // The popup should still only have one tab. EXPECT_EQ(1, app_browser->tab_count()); @@ -962,7 +962,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest2, NoTabsInPopups) { // Now try opening another tab in the app popup browser. app_popup_browser->AddTabWithURL( GURL(chrome::kAboutBlankURL), GURL(), PageTransition::TYPED, -1, - Browser::ADD_SELECTED, NULL, std::string()); + TabStripModel::ADD_SELECTED, NULL, std::string()); // The popup should still only have one tab. EXPECT_EQ(1, app_popup_browser->tab_count()); |