summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_system.cc
diff options
context:
space:
mode:
authorkalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-06 19:19:32 +0000
committerkalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-06 19:19:32 +0000
commitb8b5a9f4b0b05cbf2df308ec2e1a10a274575cf5 (patch)
treedb30f5999cf04032e5e71e9471143f56c7b401fc /chrome/browser/extensions/extension_system.cc
parente42374358f519be4f1cda0d613c77528f31fd096 (diff)
downloadchromium_src-b8b5a9f4b0b05cbf2df308ec2e1a10a274575cf5.zip
chromium_src-b8b5a9f4b0b05cbf2df308ec2e1a10a274575cf5.tar.gz
chromium_src-b8b5a9f4b0b05cbf2df308ec2e1a10a274575cf5.tar.bz2
Revert 171079 - investigating perf regression.
> Make Blacklist::IsBlacklist asynchronous (it will need to be for safe > browsing), and unravel the knots that result from it: > - Decouple it from the admin policy. > - Take the other half of blacklist logic out of ExtensionPrefs and into > Blacklist. > - Fix bug where blacklisted extensions couldn't be re-installed (let alone > re-enabled) if they get taken off the blacklist. > > > TBR=sky@chromium.org > BUG=154149,156750 > > > Review URL: https://chromiumcodereview.appspot.com/11415216 TBR=kalman@chromium.org Review URL: https://codereview.chromium.org/11478003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171554 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_system.cc')
-rw-r--r--chrome/browser/extensions/extension_system.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_system.cc b/chrome/browser/extensions/extension_system.cc
index 2881cec..3422f6d 100644
--- a/chrome/browser/extensions/extension_system.cc
+++ b/chrome/browser/extensions/extension_system.cc
@@ -103,7 +103,8 @@ void ExtensionSystemImpl::Shared::InitPrefs() {
blacklist_.reset(new Blacklist(extension_prefs_.get()));
standard_management_policy_provider_.reset(
- new StandardManagementPolicyProvider(extension_prefs_.get()));
+ new StandardManagementPolicyProvider(extension_prefs_.get(),
+ blacklist_.get()));
}
void ExtensionSystemImpl::Shared::RegisterManagementPolicyProviders() {