chrome/browser/ui/cocoa/browser_window_controller.mm - Issue 11305008: Remove TabContents from TabStripModelObserverBridge.

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/browser_window_controller.mm

Issue 11305008: Remove TabContents from TabStripModelObserverBridge. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 8 years, 2 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:

Index: chrome/browser/ui/cocoa/browser_window_controller.mm

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

index b766e1d6e34935a251e59ca0487498a00ad54b43..4a17393f6546a27e2f23f1b6bb7b757b49e47f0d 100644

--- a/chrome/browser/ui/cocoa/browser_window_controller.mm

+++ b/chrome/browser/ui/cocoa/browser_window_controller.mm

@@ -1551,9 +1551,7 @@ enum {

// applicable)?

[self updateBookmarkBarVisibilityWithAnimation:NO];

- TabContents* tabContents = TabContents::FromWebContents(contents);

- // Without the .get(), xcode fails.

- [infoBarContainerController_.get() changeTabContents:tabContents];

+ [infoBarContainerController_ changeWebContents:contents];

[previewableContentsController_ onActivateTabWithContents:contents];

}

@@ -1575,8 +1573,7 @@ enum {

}

- (void)onTabDetachedWithContents:(WebContents*)contents {

- TabContents* tabContents = TabContents::FromWebContents(contents);

- [infoBarContainerController_ tabDetachedWithContents:tabContents];

+ [infoBarContainerController_ tabDetachedWithContents:contents];

}

- (void)userChangedTheme {