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..421694176d3e76d52a7dd2b47bfdfc83abf58a9e 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" |
@@ -113,6 +115,13 @@ void ExtensionContextMenuModel::ExecuteCommand(int command_id, |
browser_->OpenURL(params); |
break; |
} |
+ case ALWAYS_ALLOW: { |
not at google - send to devlin
2014/08/07 22:03:46
"run" is a better term than "allow" I think. more
gpdavis
2014/08/08 00:51:43
Done.
|
+ content::WebContents* web_contents = |
+ browser_->tab_strip_model()->GetActiveWebContents(); |
+ extensions::ActiveScriptController::GetForWebContents(web_contents) |
not at google - send to devlin
2014/08/07 22:03:45
elsewhere we seem to guard against a null web cont
gpdavis
2014/08/08 00:51:43
Done. Should we be caching the result of GetActiv
not at google - send to devlin
2014/08/08 14:31:28
not fussed... I guess the first one is idiomatic.
gpdavis
2014/08/08 18:07:35
Done.
|
+ ->AddPersistedPermission(extension); |
+ break; |
+ } |
case CONFIGURE: |
DCHECK(!extensions::ManifestURL::GetOptionsPage(extension).is_empty()); |
extensions::ExtensionTabUtil::OpenOptionsPage(extension, browser_); |
@@ -177,6 +186,16 @@ 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 (this action). |
+ content::WebContents* web_contents = |
+ browser_->tab_strip_model()->GetActiveWebContents(); |
+ if (extensions::ActiveScriptController::GetForWebContents(web_contents) |
+ ->HasActiveScriptAction(extension)) { |
+ AddItemWithStringId(ALWAYS_ALLOW, IDS_EXTENSIONS_ALWAYS_ALLOW); |
+ } |
+ |
AddItemWithStringId(CONFIGURE, IDS_EXTENSIONS_OPTIONS_MENU_ITEM); |
AddItem(UNINSTALL, l10n_util::GetStringUTF16(IDS_EXTENSIONS_UNINSTALL)); |
if (extension_action_manager->GetBrowserAction(*extension)) |