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 e06d3a73e5e092b3d8f38f4ca3f33468cee7d184..a6f6d6d2a6647139ba2aa939788f677117698e62 100644 |
--- a/chrome/browser/extensions/extension_context_menu_model.cc |
+++ b/chrome/browser/extensions/extension_context_menu_model.cc |
@@ -6,16 +6,19 @@ |
#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" |
#include "chrome/browser/extensions/extension_service.h" |
#include "chrome/browser/extensions/extension_tab_util.h" |
+#include "chrome/browser/extensions/permissions_updater.h" |
#include "chrome/browser/profiles/profile.h" |
#include "chrome/browser/ui/browser.h" |
#include "chrome/browser/ui/chrome_pages.h" |
#include "chrome/browser/ui/tabs/tab_strip_model.h" |
#include "chrome/common/extensions/extension_constants.h" |
+#include "chrome/common/extensions/manifest_handlers/content_scripts_handler.h" |
#include "chrome/common/extensions/manifest_url_handler.h" |
#include "chrome/common/pref_names.h" |
#include "chrome/common/url_constants.h" |
@@ -24,6 +27,8 @@ |
#include "extensions/browser/extension_system.h" |
#include "extensions/browser/management_policy.h" |
#include "extensions/common/extension.h" |
+#include "extensions/common/manifest_constants.h" |
+#include "extensions/common/permissions/permission_set.h" |
#include "grit/chromium_strings.h" |
#include "grit/generated_resources.h" |
#include "ui/base/l10n/l10n_util.h" |
@@ -111,6 +116,41 @@ void ExtensionContextMenuModel::ExecuteCommand(int command_id, |
browser_->OpenURL(params); |
break; |
} |
+ case ALWAYS_ALLOW: { |
+ content::WebContents* web_contents = |
+ browser_->tab_strip_model()->GetActiveWebContents(); |
+ |
+ extensions::ActiveScriptController* script_controller = |
+ extensions::ActiveScriptController::GetForWebContents(web_contents); |
+ |
+ // Allow current tab to run injection. |
Devlin
2014/07/15 22:11:01
Let's move this logic into ActiveScriptController
|
+ script_controller->OnActiveTabPermissionGranted(extension); |
gpdavis
2014/07/15 21:56:38
Grant active tab permission so that the page actio
|
+ |
+ GURL url = web_contents->GetLastCommittedURL(); |
+ extensions::URLPatternSet new_hosts; |
+ URLPattern pattern(extensions::UserScript::ValidUserScriptSchemes()); |
+ |
+ pattern.SetScheme(url.scheme()); |
+ pattern.SetHost(url.host()); |
+ pattern.SetPath("/*"); |
+ LOG(WARNING) << "Adding pattern: " << pattern.GetAsString(); |
+ new_hosts.AddPattern(pattern); |
+ |
+ scoped_refptr<extensions::PermissionSet> new_permissions = |
+ new extensions::PermissionSet(extensions::APIPermissionSet(), |
+ extensions::ManifestPermissionSet(), |
+ extensions::URLPatternSet(), |
+ new_hosts); |
+ |
+ extensions::PermissionsUpdater updater(profile_); |
+ updater.AddPermissions(extension, new_permissions.get()); |
gpdavis
2014/07/15 21:56:38
Add current permissions for this session, since pe
|
+ |
+ extensions::ExtensionPrefs* prefs = |
+ extensions::ExtensionPrefs::Get(web_contents->GetBrowserContext()); |
+ prefs->ClearPersistedPermissions(extension); |
+ prefs->AddPersistedPermission(extension, &pattern); |
gpdavis
2014/07/15 21:56:37
Currently, I have this clearing persisted permissi
|
+ break; |
+ } |
gpdavis
2014/07/15 21:56:38
I'm not sure how much of this code belongs in this
|
case CONFIGURE: |
DCHECK(!extensions::ManifestURL::GetOptionsPage(extension).is_empty()); |
extensions::ExtensionTabUtil::OpenOptionsPage(extension, browser_); |
@@ -174,6 +214,15 @@ 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. |
+ // TODO: Only add this item if the current page does not match any |
+ // persisted permissions. |
+ if (!extension_action_manager->GetBrowserAction(*extension) && |
+ extension->GetManifestData(extensions::manifest_keys::kContentScripts)) |
+ AddItemWithStringId(ALWAYS_ALLOW, IDS_EXTENSIONS_ALWAYS_ALLOW); |
gpdavis
2014/07/15 21:56:38
Any suggestions on a clean way to resolve this TOD
|
+ |
AddItemWithStringId(CONFIGURE, IDS_EXTENSIONS_OPTIONS_MENU_ITEM); |
AddItem(UNINSTALL, l10n_util::GetStringUTF16(IDS_EXTENSIONS_UNINSTALL)); |
if (extension_action_manager->GetBrowserAction(*extension)) |