diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-24 22:29:49 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-24 22:29:49 +0000 |
| commit | 9b7262502272c7ea9016b9ed21b0f828f75b5998 (patch) | |
| tree | a2166b44d42d3411111db26acad091b61f0d8032 /chrome/browser/dom_ui | |
| parent | f7451d29b7efd0c08007a5f56414006cee20a3ef (diff) | |
| download | chromium_src-9b7262502272c7ea9016b9ed21b0f828f75b5998.zip chromium_src-9b7262502272c7ea9016b9ed21b0f828f75b5998.tar.gz chromium_src-9b7262502272c7ea9016b9ed21b0f828f75b5998.tar.bz2 | |
Revert 50752 - 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
TBR=sky@chromium.org
Review URL: http://codereview.chromium.org/2849025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50776 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/dom_ui')
| -rw-r--r-- | chrome/browser/dom_ui/filebrowse_ui.cc | 8 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/html_dialog_tab_contents_delegate.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/mediaplayer_ui.cc | 4 |
3 files changed, 7 insertions, 8 deletions
diff --git a/chrome/browser/dom_ui/filebrowse_ui.cc b/chrome/browser/dom_ui/filebrowse_ui.cc index 69d39bc..0436056 100644 --- a/chrome/browser/dom_ui/filebrowse_ui.cc +++ b/chrome/browser/dom_ui/filebrowse_ui.cc @@ -732,8 +732,8 @@ void FilebrowseHandler::OpenNewWindow(const Value* value, bool popup) { browser = BrowserList::GetLastActive(); } TabContents* contents = browser->AddTabWithURL( - GURL(path), GURL(), PageTransition::LINK, -1, - TabStripModel::ADD_SELECTED, NULL, std::string()); + GURL(path), GURL(), PageTransition::LINK, -1, Browser::ADD_SELECTED, + NULL, std::string()); // AddTabWithURL could have picked another Browser instance to create this // new tab at. So we have to reset the ptr of the browser that we want to // talk to. @@ -1100,8 +1100,8 @@ Browser* FileBrowseUI::OpenPopup(Profile* profile, } browser->AddTabWithURL( - GURL(url), GURL(), PageTransition::LINK, -1, - TabStripModel::ADD_SELECTED, NULL, std::string()); + GURL(url), GURL(), PageTransition::LINK, -1, Browser::ADD_SELECTED, + NULL, std::string()); browser->window()->SetBounds(gfx::Rect(kPopupLeft, kPopupTop, width, diff --git a/chrome/browser/dom_ui/html_dialog_tab_contents_delegate.cc b/chrome/browser/dom_ui/html_dialog_tab_contents_delegate.cc index a2ba5eb..6864386 100644 --- a/chrome/browser/dom_ui/html_dialog_tab_contents_delegate.cc +++ b/chrome/browser/dom_ui/html_dialog_tab_contents_delegate.cc @@ -42,8 +42,7 @@ void HtmlDialogTabContentsDelegate::OpenURLFromTab( Browser* browser = CreateBrowser(); TabContents* new_contents = browser->AddTabWithURL(url, referrer, transition, -1, - TabStripModel::ADD_SELECTED, NULL, - std::string()); + Browser::ADD_SELECTED, NULL, std::string()); DCHECK(new_contents); browser->window()->Show(); new_contents->Focus(); diff --git a/chrome/browser/dom_ui/mediaplayer_ui.cc b/chrome/browser/dom_ui/mediaplayer_ui.cc index 9e08f6d..b468ad2 100644 --- a/chrome/browser/dom_ui/mediaplayer_ui.cc +++ b/chrome/browser/dom_ui/mediaplayer_ui.cc @@ -503,7 +503,7 @@ void MediaPlayer::PopupPlaylist(Browser* creator) { playlist_browser_ = Browser::CreateForPopup(profile); playlist_browser_->AddTabWithURL( GURL(kMediaplayerPlaylistURL), GURL(), PageTransition::LINK, - -1, TabStripModel::ADD_SELECTED, NULL, std::string()); + -1, Browser::ADD_SELECTED, NULL, std::string()); playlist_browser_->window()->SetBounds(gfx::Rect(kPopupLeft, kPopupTop, kPopupWidth, @@ -535,7 +535,7 @@ void MediaPlayer::PopupMediaPlayer(Browser* creator) { #endif mediaplayer_browser_->AddTabWithURL( GURL(kMediaplayerURL), GURL(), PageTransition::LINK, - -1, TabStripModel::ADD_SELECTED, NULL, std::string()); + -1, Browser::ADD_SELECTED, NULL, std::string()); mediaplayer_browser_->window()->SetBounds(gfx::Rect(kPopupLeft, kPopupTop, kPopupWidth, |