diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-07 22:13:42 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-07 22:13:42 +0000 |
| commit | 59fa29fb68df7d23cf6ec69a91894e63553cfe41 (patch) | |
| tree | 464021288a211d4e3a5487016cbfa312a6656aea /chrome/browser/ui/browser_instant_controller.cc | |
| parent | 7e78f753dadf5317877124958136ab9212862b06 (diff) | |
| download | chromium_src-59fa29fb68df7d23cf6ec69a91894e63553cfe41.zip chromium_src-59fa29fb68df7d23cf6ec69a91894e63553cfe41.tar.gz chromium_src-59fa29fb68df7d23cf6ec69a91894e63553cfe41.tar.bz2 | |
Remove TabContents from TabStripModel::ReplaceTabContentsAt and TabStripModel::DiscardTabContentsAt.
BUG=107201
TEST=no visible change
Review URL: https://chromiumcodereview.appspot.com/11443039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171859 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser_instant_controller.cc')
| -rw-r--r-- | chrome/browser/ui/browser_instant_controller.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/chrome/browser/ui/browser_instant_controller.cc b/chrome/browser/ui/browser_instant_controller.cc index 9b82049..de760fc 100644 --- a/chrome/browser/ui/browser_instant_controller.cc +++ b/chrome/browser/ui/browser_instant_controller.cc @@ -92,13 +92,12 @@ void BrowserInstantController::CommitInstant(content::WebContents* preview, browser_->tab_strip_model()->AddWebContents(preview, -1, instant_.last_transition_type(), TabStripModel::ADD_ACTIVE); } else { - content::WebContents* active_tab = - browser_->tab_strip_model()->GetActiveWebContents(); - int index = browser_->tab_strip_model()->GetIndexOfWebContents(active_tab); + int index = browser_->tab_strip_model()->active_index(); DCHECK_NE(TabStripModel::kNoTab, index); + content::WebContents* active_tab = + browser_->tab_strip_model()->GetWebContentsAt(index); // TabStripModel takes ownership of |preview|. - browser_->tab_strip_model()->ReplaceTabContentsAt(index, - TabContents::FromWebContents(preview)); + browser_->tab_strip_model()->ReplaceWebContentsAt(index, preview); // InstantUnloadHandler takes ownership of |active_tab|. instant_unload_handler_.RunUnloadListenersOrDestroy(active_tab, index); |