chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm - Issue 10702029: Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

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 10702029: Move tab functions off Browser into browser_tabstrip and browser_tabrestore. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 6 months 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/tabpose_window_unittest.mm ('k') | chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm » ('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

===================================================================

--- chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm (revision 145001)

+++ chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm (working copy)

@@ -29,6 +29,7 @@

#include "chrome/browser/profiles/profile_manager.h"

#include "chrome/browser/ui/browser.h"

#include "chrome/browser/ui/browser_navigator.h"

+#include "chrome/browser/ui/browser_tabstrip.h"

#import "chrome/browser/ui/cocoa/browser_window_controller.h"

#import "chrome/browser/ui/cocoa/constrained_window_mac.h"

#include "chrome/browser/ui/cocoa/drag_util.h"

@@ -1220,8 +1221,8 @@

NSInteger activeIndex = [self indexFromModelIndex:modelIndex];

if (oldContents) {

- int oldModelIndex = browser_->GetIndexOfController(

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

+ int oldModelIndex =

+ chrome::GetIndexOfTab(browser_, oldContents->web_contents());

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

NSInteger oldIndex = [self indexFromModelIndex:oldModelIndex];

TabContentsController* oldController =