chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm - Issue 9018016: Revert r115276, it broke PanelDownloadTest.Download in interactive_ui_tests

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/cocoa/tabs/tab_strip_controller.mm

Issue 9018016: Revert r115276, it broke PanelDownloadTest.Download in interactive_ui_tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years ago

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

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm ('k') | chrome/browser/ui/collected_cookies_infobar_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm

diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm

index a5988c67a84860904bd78bbed65f64240361cd06..97c091741148ce209c5617351774244a98efc4e1 100644

--- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm

+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm

@@ -1178,7 +1178,7 @@ private:

if (oldContents) {

int oldModelIndex = browser_->GetIndexOfController(

- &(oldContents->tab_contents()->GetController()));

+ &(oldContents->tab_contents()->controller()));

if (oldModelIndex != -1) { // When closing a tab, the old tab may be gone.

NSInteger oldIndex = [self indexFromModelIndex:oldModelIndex];

TabContentsController* oldController =