chrome/browser/extensions/extension_page_actions_module.cc - Issue 8892011: Clean up TCW, make it solely a hub for 1:1 observer/helper objects.

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/extension_page_actions_module.cc

Issue 8892011: Clean up TCW, make it solely a hub for 1:1 observer/helper objects. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years 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/extensions/extension_page_actions_module.cc

diff --git a/chrome/browser/extensions/extension_page_actions_module.cc b/chrome/browser/extensions/extension_page_actions_module.cc

index 65d9cbbb54bf04fe8d79e6e2b822df9eacc6fd84..5e2aa5c9bffa9cafde75395ae627a1ee0260870f 100644

--- a/chrome/browser/extensions/extension_page_actions_module.cc

+++ b/chrome/browser/extensions/extension_page_actions_module.cc

@@ -80,7 +80,8 @@ bool PageActionFunction::SetPageActionEnabled(bool enable) {

}

// Make sure the URL hasn't changed.

- NavigationEntry* entry = contents->controller().GetActiveEntry();

+ NavigationEntry* entry =

+ contents->tab_contents()->controller().GetActiveEntry();

if (!entry || url != entry->url().spec()) {

error_ = ExtensionErrorUtils::FormatErrorMessage(kUrlNotActiveError, url);

return false;