diff options
| author | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-18 14:26:58 +0000 |
|---|---|---|
| committer | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-18 14:26:58 +0000 |
| commit | 8e7b2cf4b48a34314170ddaf0307546beaff1e73 (patch) | |
| tree | 1be057d0fd9b236dc53bb2aca300ae599d360092 /chrome/browser/extensions/extension_font_settings_api.cc | |
| parent | 8f0ccecb7381541205bd62890940906df4f5a527 (diff) | |
| download | chromium_src-8e7b2cf4b48a34314170ddaf0307546beaff1e73.zip chromium_src-8e7b2cf4b48a34314170ddaf0307546beaff1e73.tar.gz chromium_src-8e7b2cf4b48a34314170ddaf0307546beaff1e73.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/extensions/extension_font_settings_api.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_font_settings_api.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/browser/extensions/extension_font_settings_api.cc b/chrome/browser/extensions/extension_font_settings_api.cc index 87ea3b95..92b7288 100644 --- a/chrome/browser/extensions/extension_font_settings_api.cc +++ b/chrome/browser/extensions/extension_font_settings_api.cc @@ -13,6 +13,7 @@ #include "chrome/browser/extensions/extension_event_router.h" #include "chrome/browser/extensions/extension_preference_helpers.h" #include "chrome/browser/extensions/extension_service.h" +#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/extension_error_utils.h" |