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

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

Issue 3166023: When extension is blacklisted by admin policy, it should be removed if alread... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 4 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: chrome/browser/extensions/extension_prefs.cc
===================================================================
--- chrome/browser/extensions/extension_prefs.cc (revision 56844)
+++ chrome/browser/extensions/extension_prefs.cc (working copy)
@@ -241,6 +241,10 @@
const std::string& extension_id) {
std::string string_value;
+ const ListValue* blacklist = prefs_->GetList(kExtensionInstallDenyList);
+ if (!blacklist || blacklist->empty())
+ return true;
+
// Check the whitelist first.
const ListValue* whitelist = prefs_->GetList(kExtensionInstallAllowList);
if (whitelist) {
@@ -254,7 +258,6 @@
}
// Then check the blacklist (the admin blacklist, not the Google blacklist).
- const ListValue* blacklist = prefs_->GetList(kExtensionInstallDenyList);
if (blacklist) {
for (ListValue::const_iterator it = blacklist->begin();
it != blacklist->end(); ++it) {
« no previous file with comments | « chrome/browser/extensions/extension_message_service.cc ('k') | chrome/browser/extensions/extension_updater_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698