diff options
author | andybons@chromium.org <andybons@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-02 17:29:43 +0000 |
---|---|---|
committer | andybons@chromium.org <andybons@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-02 17:29:43 +0000 |
commit | 8a34e660e7b6627b71a3b24e6800090f239075bb (patch) | |
tree | e76c3a12d82cd6e6d8dc467596316f0666fd1296 /chrome/browser/browser.cc | |
parent | 0b4158e6bc07aea93651c05c3bf26c2152bd9842 (diff) | |
download | chromium_src-8a34e660e7b6627b71a3b24e6800090f239075bb.zip chromium_src-8a34e660e7b6627b71a3b24e6800090f239075bb.tar.gz chromium_src-8a34e660e7b6627b71a3b24e6800090f239075bb.tar.bz2 |
Rip out phantom tabs and corresponding unit tests.
Also get rid of the type enum passed to TabReplacedAt since it can only be one option after phantom tabs are removed.
BUG=none
TEST=compile? good. pass tests? good.
Review URL: http://codereview.chromium.org/3539010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61303 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.cc')
-rw-r--r-- | chrome/browser/browser.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index 393d50a..b585865 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -2602,7 +2602,8 @@ void Browser::TabMoved(TabContents* contents, } void Browser::TabReplacedAt(TabContents* old_contents, - TabContents* new_contents, int index) { + TabContents* new_contents, + int index) { TabDetachedAtImpl(old_contents, index, DETACH_TYPE_REPLACE); TabInsertedAt(new_contents, index, (index == tab_handler_->GetTabStripModel()->selected_index())); @@ -3261,9 +3262,7 @@ void Browser::CommitMatchPreview(TabContents* preview_contents) { tab_contents->controller()); // TabStripModel takes ownership of preview_contents. tab_handler_->GetTabStripModel()->ReplaceTabContentsAt( - index, - preview_contents, - TabStripModelObserver::REPLACE_MATCH_PREVIEW); + index, preview_contents); } void Browser::SetSuggestedText(const string16& text) { |