Support "always allow" for runtime script execution

chrome/browser/extensions/extension_context_menu_model.cc

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 2edc1ac95b05846252fe157e92d98de4fb5c8e23..c5e1f5038480b478dc60be4ff093647d803f4f6f 100644
--- a/chrome/browser/extensions/extension_context_menu_model.cc
+++ b/chrome/browser/extensions/extension_context_menu_model.cc
@@ -7,6 +7,7 @@
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
+#include "chrome/browser/extensions/active_script_controller.h"
 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
 #include "chrome/browser/extensions/context_menu_matcher.h"
 #include "chrome/browser/extensions/extension_action.h"
@@ -31,6 +32,7 @@
 #include "extensions/browser/management_policy.h"
 #include "extensions/browser/uninstall_reason.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/manifest_constants.h"

[Devlin, 2014/08/14 01:20:18]

why??

[gpdavis, 2014/08/14 20:05:43]

Oops, thought we still needed this for determining whether to add "Always Run",
but we changed the way that works.  I don't want to give you the impression that
I'm not checking over added includes (clearly I'm just not being thorough
enough).

Done.

 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -120,8 +122,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;
 
@@ -164,6 +165,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_);
@@ -237,6 +246,18 @@ void ExtensionContextMenuModel::InitMenu(const Extension* extension) {
   AddItem(NAME, base::UTF8ToUTF16(extension_name));
   AppendExtensionItems();
   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))
@@ -267,3 +288,7 @@ void ExtensionContextMenuModel::AppendExtensionItems() {
                                          &extension_items_count_,
                                          true);  // is_action_menu
 }
+
+content::WebContents* ExtensionContextMenuModel::GetActiveWebContents() const {
+  return browser_->tab_strip_model()->GetActiveWebContents();
+}