| Index: chrome/browser/extensions/extension_context_menu_model.cc
|
| diff --git a/chrome/browser/extensions/extension_context_menu_model.cc b/chrome/browser/extensions/extension_context_menu_model.cc
|
| index 3334fd9ccc063a8409a9b146992717331460d3b8..9f38577fbd3ceb508d27c66edf4507395c562dbc 100644
|
| --- a/chrome/browser/extensions/extension_context_menu_model.cc
|
| +++ b/chrome/browser/extensions/extension_context_menu_model.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include "base/prefs/pref_service.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| +#include "chrome/browser/extensions/active_script_controller.h"
|
| #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
|
| #include "chrome/browser/extensions/extension_action.h"
|
| #include "chrome/browser/extensions/extension_action_manager.h"
|
| @@ -26,6 +27,7 @@
|
| #include "extensions/browser/management_policy.h"
|
| #include "extensions/browser/uninstall_reason.h"
|
| #include "extensions/common/extension.h"
|
| +#include "extensions/common/manifest_constants.h"
|
| #include "grit/chromium_strings.h"
|
| #include "grit/generated_resources.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| @@ -79,8 +81,7 @@ bool ExtensionContextMenuModel::IsCommandIdEnabled(int command_id) const {
|
| // homepage, we just disable this menu item.
|
| return extensions::ManifestURL::GetHomepageURL(extension).is_valid();
|
| } else if (command_id == INSPECT_POPUP) {
|
| - WebContents* web_contents =
|
| - browser_->tab_strip_model()->GetActiveWebContents();
|
| + WebContents* web_contents = GetActiveWebContents();
|
| if (!web_contents)
|
| return false;
|
|
|
| @@ -113,6 +114,14 @@ void ExtensionContextMenuModel::ExecuteCommand(int command_id,
|
| browser_->OpenURL(params);
|
| break;
|
| }
|
| + case ALWAYS_RUN: {
|
| + WebContents* web_contents = GetActiveWebContents();
|
| + if (web_contents) {
|
| + extensions::ActiveScriptController::GetForWebContents(web_contents)
|
| + ->AlwaysRunOnVisibleHost(extension);
|
| + }
|
| + break;
|
| + }
|
| case CONFIGURE:
|
| DCHECK(!extensions::ManifestURL::GetOptionsPage(extension).is_empty());
|
| extensions::ExtensionTabUtil::OpenOptionsPage(extension, browser_);
|
| @@ -177,6 +186,18 @@ void ExtensionContextMenuModel::InitMenu(const Extension* extension) {
|
| base::ReplaceChars(extension_name, "&", "&&", &extension_name);
|
| AddItem(NAME, base::UTF8ToUTF16(extension_name));
|
| AddSeparator(ui::NORMAL_SEPARATOR);
|
| +
|
| + // Add the "Always Allow" item for adding persisted permissions for script
|
| + // injections if there is an active action for this extension. Note that this
|
| + // will add it to *all* extension action context menus, not just the one
|
| + // attached to the script injection request icon, but that's okay.
|
| + WebContents* web_contents = GetActiveWebContents();
|
| + if (web_contents &&
|
| + extensions::ActiveScriptController::GetForWebContents(web_contents)
|
| + ->HasActiveScriptAction(extension)) {
|
| + AddItemWithStringId(ALWAYS_RUN, IDS_EXTENSIONS_ALWAYS_RUN);
|
| + }
|
| +
|
| AddItemWithStringId(CONFIGURE, IDS_EXTENSIONS_OPTIONS_MENU_ITEM);
|
| AddItem(UNINSTALL, l10n_util::GetStringUTF16(IDS_EXTENSIONS_UNINSTALL));
|
| if (extension_action_manager->GetBrowserAction(*extension))
|
| @@ -190,3 +211,7 @@ const Extension* ExtensionContextMenuModel::GetExtension() const {
|
| extensions::ExtensionSystem::Get(profile_)->extension_service();
|
| return extension_service->GetExtensionById(extension_id_, false);
|
| }
|
| +
|
| +content::WebContents* ExtensionContextMenuModel::GetActiveWebContents() const {
|
| + return browser_->tab_strip_model()->GetActiveWebContents();
|
| +}
|
|
|