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/gtk/tabs/tab_strip_gtk.cc | |
| 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/gtk/tabs/tab_strip_gtk.cc')
| -rw-r--r-- | chrome/browser/gtk/tabs/tab_strip_gtk.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/gtk/tabs/tab_strip_gtk.cc b/chrome/browser/gtk/tabs/tab_strip_gtk.cc index 0a86cb8..a05105a 100644 --- a/chrome/browser/gtk/tabs/tab_strip_gtk.cc +++ b/chrome/browser/gtk/tabs/tab_strip_gtk.cc @@ -1611,8 +1611,8 @@ bool TabStripGtk::CompleteDrop(guchar* data) { model_->delegate()->CreateTabContentsForURL( url, GURL(), model_->profile(), PageTransition::TYPED, false, NULL); - model_->AddTabContents(contents, drop_index, PageTransition::GENERATED, - TabStripModel::ADD_SELECTED); + model_->AddTabContents(contents, drop_index, false, + PageTransition::GENERATED, true); } else { model_->GetTabContentsAt(drop_index)->controller().LoadURL( url, GURL(), PageTransition::GENERATED); @@ -1982,8 +1982,9 @@ void TabStripGtk::OnNewTabClicked(GtkWidget* widget) { model_->AddTabContents( contents, -1, // index + false, // force_index PageTransition::TYPED, - TabStripModel::ADD_SELECTED); + true); // foreground break; } default: |