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

Unified Diff: chrome/browser/extensions/admin_policy.cc

Issue 11415216: Make Blacklist::IsBlacklist asynchronous (it will need to be for safe (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix another test Created 8 years 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
« no previous file with comments | « chrome/browser/extensions/admin_policy.h ('k') | chrome/browser/extensions/admin_policy_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/admin_policy.cc
diff --git a/chrome/browser/extensions/admin_policy.cc b/chrome/browser/extensions/admin_policy.cc
index c25e31bc685911640ea9c7688759110c5993863e..ea69dabc9f3eef595d2a341b0e4febc30820a57b 100644
--- a/chrome/browser/extensions/admin_policy.cc
+++ b/chrome/browser/extensions/admin_policy.cc
@@ -41,8 +41,7 @@ bool BlacklistedByDefault(const base::ListValue* blacklist) {
return blacklist && blacklist->Find(wildcard) != blacklist->end();
}
-bool UserMayLoad(bool is_google_blacklisted,
- const base::ListValue* blacklist,
+bool UserMayLoad(const base::ListValue* blacklist,
const base::ListValue* whitelist,
const base::ListValue* forcelist,
const Extension* extension,
@@ -50,19 +49,17 @@ bool UserMayLoad(bool is_google_blacklisted,
if (IsRequired(extension))
return true;
- if ((!blacklist || blacklist->empty()) && !is_google_blacklisted)
+ if (!blacklist || blacklist->empty())
return true;
- // Check the whitelist/forcelist first (takes precedence over Google
- // blacklist).
+ // Check the whitelist/forcelist first.
base::StringValue id_value(extension->id());
if ((whitelist && whitelist->Find(id_value) != whitelist->end()) ||
(forcelist && forcelist->Find(id_value) != forcelist->end()))
return true;
- // Then check both admin and Google blacklists.
- bool result = !is_google_blacklisted &&
- (!blacklist || blacklist->Find(id_value) == blacklist->end()) &&
+ // Then check the admin blacklist.
+ bool result = (!blacklist || blacklist->Find(id_value) == blacklist->end()) &&
!BlacklistedByDefault(blacklist);
if (error && !result) {
*error = l10n_util::GetStringFUTF16(
« no previous file with comments | « chrome/browser/extensions/admin_policy.h ('k') | chrome/browser/extensions/admin_policy_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698