diff options
| author | danno@chromium.org <danno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-10 13:55:18 +0000 |
|---|---|---|
| committer | danno@chromium.org <danno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-10 13:55:18 +0000 |
| commit | 492d214950b16d229ced62021486e9e0ec859e40 (patch) | |
| tree | ac098e0dc234b894433b13d409ddb198cd9d24b1 /chrome/browser/browser_process_impl.cc | |
| parent | 0ef5163fe4f9a76f516f09f7aa9d19c322e79691 (diff) | |
| download | chromium_src-492d214950b16d229ced62021486e9e0ec859e40.zip chromium_src-492d214950b16d229ced62021486e9e0ec859e40.tar.gz chromium_src-492d214950b16d229ced62021486e9e0ec859e40.tar.bz2 | |
Policy: plugins disabled by policy should honor policy changes without Chrome relaunch.
BUG=54620
TEST=PrefChangeRegistrarTest.*
Review URL: http://codereview.chromium.org/3316007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59094 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_process_impl.cc')
| -rw-r--r-- | chrome/browser/browser_process_impl.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index 472464f..539bf57 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -37,6 +37,7 @@ #include "chrome/browser/net/sqlite_persistent_cookie_store.h" #include "chrome/browser/notifications/notification_ui_manager.h" #include "chrome/browser/plugin_service.h" +#include "chrome/browser/plugin_updater.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/printing/print_job_manager.h" #include "chrome/browser/profile_manager.h" @@ -605,6 +606,13 @@ void BrowserProcessImpl::CreateLocalState() { FilePath local_state_path; PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path); local_state_.reset(PrefService::CreatePrefService(local_state_path, NULL)); + + // Make sure the the plugin updater gets notifications of changes + // in the plugin blacklist. + local_state_->RegisterListPref(prefs::kPluginsPluginsBlacklist); + plugin_state_change_registrar_.Init(local_state_.get()); + plugin_state_change_registrar_.Add(prefs::kPluginsPluginsBlacklist, + PluginUpdater::GetPluginUpdater()); } void BrowserProcessImpl::CreateIconManager() { |