summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extensions_service.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/extensions/extensions_service.cc')
-rw-r--r--chrome/browser/extensions/extensions_service.cc29
1 files changed, 1 insertions, 28 deletions
diff --git a/chrome/browser/extensions/extensions_service.cc b/chrome/browser/extensions/extensions_service.cc
index 99ca4cc..61de28b 100644
--- a/chrome/browser/extensions/extensions_service.cc
+++ b/chrome/browser/extensions/extensions_service.cc
@@ -200,9 +200,6 @@ ExtensionsService::ExtensionsService(Profile* profile,
NotificationService::AllSources());
registrar_.Add(this, NotificationType::EXTENSION_PROCESS_TERMINATED,
Source<Profile>(profile_));
- // We outlive the profile, so we don't unregister these.
- prefs->AddPrefObserver(prefs::kExtensionInstallAllowList, this);
- prefs->AddPrefObserver(prefs::kExtensionInstallDenyList, this);
// Set up the ExtensionUpdater
if (autoupdate_enabled) {
@@ -217,7 +214,7 @@ ExtensionsService::ExtensionsService(Profile* profile,
backend_ = new ExtensionsServiceBackend(install_directory_);
- // Use monochrome icons for Omnibox icons.
+ // Use monochrome icons for omnibox icons.
omnibox_icon_manager_.set_monochrome(true);
}
@@ -764,22 +761,6 @@ void ExtensionsService::UpdateExtensionBlacklist(
}
}
-void ExtensionsService::CheckAdminBlacklist() {
- std::vector<std::string> to_be_removed;
- // Loop through extensions list, unload installed extensions.
- for (ExtensionList::const_iterator iter = extensions_.begin();
- iter != extensions_.end(); ++iter) {
- Extension* extension = (*iter);
- if (!extension_prefs_->IsExtensionAllowedByPolicy(extension->id()))
- to_be_removed.push_back(extension->id());
- }
-
- // UnloadExtension will change the extensions_ list. So, we should
- // call it outside the iterator loop.
- for (unsigned int i = 0; i < to_be_removed.size(); ++i)
- UnloadExtension(to_be_removed[i]);
-}
-
bool ExtensionsService::IsIncognitoEnabled(const Extension* extension) {
// If this is a component extension we always allow it to work in incognito
// mode.
@@ -1298,14 +1279,6 @@ void ExtensionsService::Observe(NotificationType type,
break;
}
- case NotificationType::PREF_CHANGED: {
- std::string* pref_name = Details<std::string>(details).ptr();
- DCHECK(*pref_name == prefs::kExtensionInstallAllowList ||
- *pref_name == prefs::kExtensionInstallDenyList);
- CheckAdminBlacklist();
- break;
- }
-
default:
NOTREACHED() << "Unexpected notification type.";
}