chrome/browser/extensions/api/extension_action/extension_actions_api.cc - Issue 10917026: Switch Extensions::TabHelper to use WebContents, 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/extensions/api/extension_action/extension_actions_api.cc

Issue 10917026: Switch Extensions::TabHelper to use WebContents, WebContentsUserData. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase only 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:

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

Download patch

« no previous file with comments | « chrome/browser/extensions/active_tab_unittest.cc ('k') | chrome/browser/extensions/api/extension_action/extension_page_actions_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/extension_action/extension_actions_api.cc

diff --git a/chrome/browser/extensions/api/extension_action/extension_actions_api.cc b/chrome/browser/extensions/api/extension_action/extension_actions_api.cc

index 1f919f1177f6996e09497d7798e50e0299e181d6..78a1815af961a2a4634ca560f2fe863649158e59 100644

--- a/chrome/browser/extensions/api/extension_action/extension_actions_api.cc

+++ b/chrome/browser/extensions/api/extension_action/extension_actions_api.cc

@@ -376,7 +376,8 @@ void ExtensionActionFunction::NotifyBrowserActionChange() {

}

void ExtensionActionFunction::NotifyLocationBarChange() {

- contents_->extension_tab_helper()->location_bar_controller()->NotifyChange();

+ extensions::TabHelper::FromWebContents(contents_->web_contents())->

+ location_bar_controller()->NotifyChange();

}

// static

@@ -425,7 +426,7 @@ bool ExtensionActionFunction::SetVisible(bool visible) {

extensions::TabHelper& ExtensionActionFunction::tab_helper() const {

CHECK(contents_);

- return *contents_->extension_tab_helper();

+ return *extensions::TabHelper::FromWebContents(contents_->web_contents());

}

bool ExtensionActionShowFunction::RunExtensionAction() {