chrome/browser/ui/tabs/tab_strip_model_unittest.cc - Issue 11359201: Remove TabContents from TabStripModelObserver::TabReplacedAt.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/tabs/tab_strip_model_unittest.cc

Issue 11359201: Remove TabContents from TabStripModelObserver::TabReplacedAt. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 8 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/ui/tabs/tab_strip_model_unittest.cc

diff --git a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc

index 08ce95f9be49fb212b92e4eadaaa1fd06450372a..ada146acc1ee353cfe75067c13f0f682d65dc02a 100644

--- a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc

+++ b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc

@@ -317,12 +317,11 @@ class MockTabStripModelObserver : public TabStripModelObserver {

states_.push_back(State(contents, index, CHANGE));

}

virtual void TabReplacedAt(TabStripModel* tab_strip_model,

- TabContents* old_contents,

- TabContents* new_contents,

+ WebContents* old_contents,

+ WebContents* new_contents,

int index) OVERRIDE {

- State s(

- new_contents ? new_contents->web_contents() : NULL, index, REPLACED);

- s.src_contents = old_contents ? old_contents->web_contents() : NULL;

+ State s(new_contents, index, REPLACED);

+ s.src_contents = old_contents;

states_.push_back(s);

}

virtual void TabPinnedStateChanged(WebContents* contents,