Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(48)

Unified Diff: extensions/common/permissions/permissions_data.cc

Issue 1140173003: Allow whitelisted content scripts to be injected in WebViews. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@document_has_focus
Patch Set: Use PermissionsData to check whitelist Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: extensions/common/permissions/permissions_data.cc
diff --git a/extensions/common/permissions/permissions_data.cc b/extensions/common/permissions/permissions_data.cc
index 0488f0a1b17c3c0e8412120253b3a85363585850..f0c612c5042b379222caff82c544bbbb6c05f457 100644
--- a/extensions/common/permissions/permissions_data.cc
+++ b/extensions/common/permissions/permissions_data.cc
@@ -49,18 +49,24 @@ void PermissionsData::SetPolicyDelegate(PolicyDelegate* delegate) {
}
// static
-bool PermissionsData::CanExecuteScriptEverywhere(const Extension* extension) {
- if (extension->location() == Manifest::COMPONENT)
- return true;
-
+bool PermissionsData::IsExtensionIdWhitelisted(
+ const std::string& extension_id) {
const ExtensionsClient::ScriptingWhitelist& whitelist =
ExtensionsClient::Get()->GetScriptingWhitelist();
- return std::find(whitelist.begin(), whitelist.end(), extension->id()) !=
+ return std::find(whitelist.begin(), whitelist.end(), extension_id) !=
whitelist.end();
}
// static
+bool PermissionsData::CanExecuteScriptEverywhere(const Extension* extension) {
+ if (extension->location() == Manifest::COMPONENT)
+ return true;
+
+ return IsExtensionIdWhitelisted(extension->id());
+}
+
+// static
bool PermissionsData::ScriptsMayRequireActionForExtension(
const Extension* extension,
const PermissionSet* permissions) {

Powered by Google App Engine
This is Rietveld 408576698