summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_page_actions_module.cc
diff options
context:
space:
mode:
authormpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-13 23:17:50 +0000
committermpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-13 23:17:50 +0000
commit37e960ee509ed1dc210596e681197700959d82fd (patch)
treeca9b680c2318b95d9e9d7d1df3ba24954267889c /chrome/browser/extensions/extension_page_actions_module.cc
parentae26adc5aa3ae836993f42592fbc2a8dc7a4186b (diff)
downloadchromium_src-37e960ee509ed1dc210596e681197700959d82fd.zip
chromium_src-37e960ee509ed1dc210596e681197700959d82fd.tar.gz
chromium_src-37e960ee509ed1dc210596e681197700959d82fd.tar.bz2
Update page action manifest parsing to match the new format.
Preserves backwards compatability with the old manifest format. BUG=24635 Review URL: http://codereview.chromium.org/275007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28912 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_page_actions_module.cc')
-rw-r--r--chrome/browser/extensions/extension_page_actions_module.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/browser/extensions/extension_page_actions_module.cc b/chrome/browser/extensions/extension_page_actions_module.cc
index 446a91d..51866e3 100644
--- a/chrome/browser/extensions/extension_page_actions_module.cc
+++ b/chrome/browser/extensions/extension_page_actions_module.cc
@@ -71,9 +71,7 @@ bool PageActionFunction::SetPageActionEnabled(bool enable) {
return false;
}
- const ExtensionAction* page_action =
- extension->GetExtensionAction(page_action_id,
- ExtensionAction::PAGE_ACTION);
+ const ExtensionAction* page_action = extension->page_action();
if (!page_action) {
error_ = ExtensionErrorUtils::FormatErrorMessage(keys::kNoPageActionError,
page_action_id);