chrome/browser/ui/toolbar/action_box_menu_model.cc - 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/toolbar/action_box_menu_model.cc

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/toolbar/action_box_menu_model.cc

diff --git a/chrome/browser/ui/toolbar/action_box_menu_model.cc b/chrome/browser/ui/toolbar/action_box_menu_model.cc

index 31cafeed3482a6ab43c82f2eb22b097a285d99e7..4aa1fd49d08bbaddadbe5cac0b4c5da9e6a46ff2 100644

--- a/chrome/browser/ui/toolbar/action_box_menu_model.cc

+++ b/chrome/browser/ui/toolbar/action_box_menu_model.cc

@@ -48,8 +48,11 @@ ActionBoxMenuModel::ActionBoxMenuModel(Browser* browser)

rb.GetNativeImageNamed(IDR_MOBILE));

}

- TabContents* current_tab_contents = chrome::GetActiveTabContents(browser_);

- bool starred = current_tab_contents->bookmark_tab_helper()->is_starred();

+ content::WebContents* current_web_contents =

+ chrome::GetActiveWebContents(browser_);

+ BookmarkTabHelper* bookmark_tab_helper =

+ BookmarkTabHelper::FromWebContents(current_web_contents);

+ bool starred = bookmark_tab_helper->is_starred();

AddItemWithStringId(IDC_BOOKMARK_PAGE,

starred ? IDS_TOOLTIP_STARRED : IDS_TOOLTIP_STAR);

SetIcon(GetIndexOfCommandId(IDC_BOOKMARK_PAGE),

« no previous file with comments | « chrome/browser/ui/tab_contents/tab_contents.cc ('k') | no next file » | no next file with comments »