summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_page_actions_module.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/extensions/extension_page_actions_module.cc')
-rw-r--r--chrome/browser/extensions/extension_page_actions_module.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_page_actions_module.cc b/chrome/browser/extensions/extension_page_actions_module.cc
index 09d2c47..66bd9e3 100644
--- a/chrome/browser/extensions/extension_page_actions_module.cc
+++ b/chrome/browser/extensions/extension_page_actions_module.cc
@@ -41,7 +41,8 @@ bool PageActionFunction::SetPageActionEnabled(bool enable) {
}
// Make sure the URL hasn't changed.
- if (url != contents->controller().GetActiveEntry()->url().spec()) {
+ NavigationEntry* entry = contents->controller().GetActiveEntry();
+ if (!entry || url != entry->url().spec()) {
error_ = ExtensionErrorUtils::FormatErrorMessage(keys::kUrlNotActiveError,
url);
return false;