From 8e7b2cf4b48a34314170ddaf0307546beaff1e73 Mon Sep 17 00:00:00 2001 From: "joaodasilva@chromium.org" Date: Wed, 18 Apr 2012 14:26:58 +0000 Subject: Disable loading of unpacked extensions when '*' is blacklisted, both via the UI and via the --load-extension switch. The load-unpacked button is also disabled in this case. Also did a little IWYU header cleanup that was required after removing pref_service.h from extension_prefs.h. BUG=104356 TEST=Set the extension blacklist policy to '*'. Loading unpacked extensions and using the --load-extension switch are now disabled. Review URL: http://codereview.chromium.org/10106021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132788 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/extensions/extension_system.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'chrome/browser/extensions/extension_system.h') diff --git a/chrome/browser/extensions/extension_system.h b/chrome/browser/extensions/extension_system.h index e32c048..9b1d14ad 100644 --- a/chrome/browser/extensions/extension_system.h +++ b/chrome/browser/extensions/extension_system.h @@ -20,7 +20,6 @@ class ExtensionInfoMap; class ExtensionMessageService; class ExtensionNavigationObserver; class ExtensionPrefs; -class ExtensionPrefValueMap; class ExtensionProcessManager; class ExtensionService; class Profile; @@ -191,6 +190,8 @@ class ExtensionSystemImpl : public ExtensionSystem { // access to the ResourceContext owned by |io_data_|. scoped_ptr extension_process_manager_; scoped_ptr alarm_manager_; + + DISALLOW_COPY_AND_ASSIGN(ExtensionSystemImpl); }; #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_SYSTEM_H_ -- cgit v1.1