summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/admin_policy.h
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/extensions/admin_policy.h')
-rw-r--r--chrome/browser/extensions/admin_policy.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/extensions/admin_policy.h b/chrome/browser/extensions/admin_policy.h
index 38ff932..5d69d07 100644
--- a/chrome/browser/extensions/admin_policy.h
+++ b/chrome/browser/extensions/admin_policy.h
@@ -22,10 +22,12 @@ namespace admin_policy {
// from the command line, or when loaded as an unpacked extension).
bool BlacklistedByDefault(const base::ListValue* blacklist);
-// Returns true if the extension is allowed by admin policy white- and
-// blacklists.
-bool UserMayLoad(const base::ListValue* blacklist,
+// Returns true if the extension is allowed by Google blacklist and admin policy
+// white-, black- and forcelists.
+bool UserMayLoad(bool is_google_blacklisted,
+ const base::ListValue* blacklist,
const base::ListValue* whitelist,
+ const base::ListValue* forcelist,
const Extension* extension,
string16* error);