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/test | |
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/test')
-rw-r--r-- | chrome/test/browser_with_test_window_test.cc | 2 | ||||
-rw-r--r-- | chrome/test/in_process_browser_test.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/test/browser_with_test_window_test.cc b/chrome/test/browser_with_test_window_test.cc index d1b6c49..b0ab2ef 100644 --- a/chrome/test/browser_with_test_window_test.cc +++ b/chrome/test/browser_with_test_window_test.cc @@ -57,7 +57,7 @@ TestRenderViewHost* BrowserWithTestWindowTest::TestRenderViewHostForTab( void BrowserWithTestWindowTest::AddTab(Browser* browser, const GURL& url) { TabContents* new_tab = browser->AddTabWithURL( - url, GURL(), PageTransition::TYPED, 0, Browser::ADD_SELECTED, NULL, + url, GURL(), PageTransition::TYPED, 0, TabStripModel::ADD_SELECTED, NULL, std::string()); CommitPendingLoad(&new_tab->controller()); } diff --git a/chrome/test/in_process_browser_test.cc b/chrome/test/in_process_browser_test.cc index ac307de..3be8b01 100644 --- a/chrome/test/in_process_browser_test.cc +++ b/chrome/test/in_process_browser_test.cc @@ -249,7 +249,7 @@ Browser* InProcessBrowserTest::CreateBrowser(Profile* profile) { browser->AddTabWithURL(GURL(chrome::kAboutBlankURL), GURL(), PageTransition::START_PAGE, -1, - Browser::ADD_SELECTED, NULL, std::string()); + TabStripModel::ADD_SELECTED, NULL, std::string()); // Wait for the page to finish loading. ui_test_utils::WaitForNavigation( |