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

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

Issue 10382149: Refactor the various ways to control what users can do to extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 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
« no previous file with comments | « chrome/browser/extensions/extension_system.h ('k') | chrome/browser/extensions/installed_loader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_system.cc
===================================================================
--- chrome/browser/extensions/extension_system.cc (revision 140193)
+++ chrome/browser/extensions/extension_system.cc (working copy)
@@ -26,6 +26,7 @@
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_system_factory.h"
#include "chrome/browser/extensions/lazy_background_task_queue.h"
+#include "chrome/browser/extensions/management_policy.h"
#include "chrome/browser/extensions/unpacked_installer.h"
#include "chrome/browser/extensions/user_script_master.h"
#include "chrome/browser/prefs/pref_service.h"
@@ -84,6 +85,11 @@
extension_prefs_->Init(extensions_disabled);
}
+void ExtensionSystemImpl::Shared::RegisterManagementPolicyProviders() {
+ DCHECK(extension_prefs_.get());
+ management_policy_->RegisterProvider(extension_prefs_.get());
+}
+
void ExtensionSystemImpl::Shared::InitInfoMap() {
// The ExtensionInfoMap needs to be created before the
// ExtensionProcessManager.
@@ -120,6 +126,11 @@
autoupdate_enabled,
extensions_enabled));
+ // The ManagementPolicy providers msut be registered before the
+ // ExtensionService tries to load any extensions.
+ management_policy_.reset(new extensions::ManagementPolicy);
+ RegisterManagementPolicyProviders();
+
extension_service_->component_loader()->AddDefaultComponentExtensions();
if (command_line->HasSwitch(switches::kLoadComponentExtension)) {
CommandLine::StringType path_list = command_line->GetSwitchValueNative(
@@ -189,6 +200,10 @@
return extension_service_.get();
}
+extensions::ManagementPolicy* ExtensionSystemImpl::Shared::management_policy() {
+ return management_policy_.get();
+}
+
UserScriptMaster* ExtensionSystemImpl::Shared::user_script_master() {
return user_script_master_.get();
}
@@ -261,6 +276,10 @@
return shared_->extension_service();
}
+extensions::ManagementPolicy* ExtensionSystemImpl::management_policy() {
+ return shared_->management_policy();
+}
+
UserScriptMaster* ExtensionSystemImpl::user_script_master() {
return shared_->user_script_master();
}
« no previous file with comments | « chrome/browser/extensions/extension_system.h ('k') | chrome/browser/extensions/installed_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698