diff options
| author | sreeram@chromium.org <sreeram@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-14 06:14:20 +0000 |
|---|---|---|
| committer | sreeram@chromium.org <sreeram@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-14 06:14:20 +0000 |
| commit | d572bfd0d4688449141d9de6a65792b2ece5e683 (patch) | |
| tree | 9f4c7f520270d260be626383a260ef28f6b52a6f /chrome/browser/ui/browser_instant_controller.cc | |
| parent | 4858648aebd022488f06f6bd6a0d5769a26fb898 (diff) | |
| download | chromium_src-d572bfd0d4688449141d9de6a65792b2ece5e683.zip chromium_src-d572bfd0d4688449141d9de6a65792b2ece5e683.tar.gz chromium_src-d572bfd0d4688449141d9de6a65792b2ece5e683.tar.bz2 | |
Use scoped_ptr to document ownership in InstantUnloadHandler.
And some cosmetic changes in other Instant files.
BUG=none
R=jered@chromium.org,sky@chromium.org
TEST=none; no change in functionality.
Review URL: https://chromiumcodereview.appspot.com/12256029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182397 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 | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/chrome/browser/ui/browser_instant_controller.cc b/chrome/browser/ui/browser_instant_controller.cc index 9d92283..14f0113 100644 --- a/chrome/browser/ui/browser_instant_controller.cc +++ b/chrome/browser/ui/browser_instant_controller.cc @@ -169,15 +169,10 @@ void BrowserInstantController::ReplaceWebContentsAt( int index, scoped_ptr<content::WebContents> new_contents) { DCHECK_NE(TabStripModel::kNoTab, index); - content::WebContents* old_contents = - browser_->tab_strip_model()->GetWebContentsAt(index); - // TabStripModel takes ownership of |new_contents|. - browser_->tab_strip_model()->ReplaceWebContentsAt( - index, new_contents.release()); - // TODO(samarth): use scoped_ptr instead of comments to document ownership - // transfer. - // InstantUnloadHandler takes ownership of |old_contents|. - instant_unload_handler_.RunUnloadListenersOrDestroy(old_contents, index); + scoped_ptr<content::WebContents> old_contents(browser_->tab_strip_model()-> + ReplaceWebContentsAt(index, new_contents.release())); + instant_unload_handler_.RunUnloadListenersOrDestroy(old_contents.Pass(), + index); } void BrowserInstantController::SetInstantSuggestion( |