chrome/browser/ui/cocoa/browser_window_controller_private.mm - Issue 10945010: Switch BookmarkTabHelper to use WebContentsUserData.

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_private.mm

Issue 10945010: Switch BookmarkTabHelper to use WebContentsUserData. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 8 years, 3 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_private.mm

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

index 1f31c4728a2f977e9a6b13e5994eb3ec6d4c2edd..6d69a975e70b557e321df53271a60419e7915074 100644

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

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

@@ -486,8 +486,10 @@ willPositionSheet:(NSWindow*)sheet

- (BOOL)shouldShowDetachedBookmarkBar {

DCHECK(browser_.get());

- TabContents* tab = chrome::GetActiveTabContents(browser_.get());

- return (tab && tab->bookmark_tab_helper()->ShouldShowBookmarkBar() &&

+ WebContents* web_contents = chrome::GetActiveWebContents(browser_.get());

+ BookmarkTabHelper* bookmark_tab_helper =

+ web_contents ? BookmarkTabHelper::FromWebContents(web_contents) : NULL;

+ return (bookmark_tab_helper && bookmark_tab_helper->ShouldShowBookmarkBar() &&

![previewableContentsController_ isShowingPreview]);

}