diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-28 11:36:30 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-28 11:36:30 +0000 |
| commit | 732d5af82b29cfb7b1f01a9ef87be866dddf6d6d (patch) | |
| tree | d3e868b3d2d9acd7ef79ac65126ff730e3e50e8a /chrome/browser/browser_process_impl.cc | |
| parent | a0e8cc1d155e0d36ea9923451dc9241ee833df99 (diff) | |
| download | chromium_src-732d5af82b29cfb7b1f01a9ef87be866dddf6d6d.zip chromium_src-732d5af82b29cfb7b1f01a9ef87be866dddf6d6d.tar.gz chromium_src-732d5af82b29cfb7b1f01a9ef87be866dddf6d6d.tar.bz2 | |
Observe plug-in blacklist changes in user preferences instead of local state.
Previously, we would read the plug-in blacklist from user prefs at startup, but watch for changes (only!) in local state, which just seems wrong.
BUG=80025,45856
TEST=none
Review URL: http://codereview.chromium.org/6898050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83324 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_process_impl.cc')
| -rw-r--r-- | chrome/browser/browser_process_impl.cc | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index 208336d..2ffa29d 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -38,7 +38,6 @@ #include "chrome/browser/net/sdch_dictionary_fetcher.h" #include "chrome/browser/notifications/notification_ui_manager.h" #include "chrome/browser/plugin_data_remover.h" -#include "chrome/browser/plugin_updater.h" #include "chrome/browser/policy/browser_policy_connector.h" #include "chrome/browser/prefs/browser_prefs.h" #include "chrome/browser/prefs/pref_service.h" @@ -841,18 +840,6 @@ void BrowserProcessImpl::CreateLocalState() { pref_change_registrar_.Init(local_state_.get()); - // Make sure the the plugin updater gets notifications of changes - // in the plugin policy lists. - local_state_->RegisterListPref(prefs::kPluginsDisabledPlugins); - pref_change_registrar_.Add(prefs::kPluginsDisabledPlugins, - PluginUpdater::GetInstance()); - local_state_->RegisterListPref(prefs::kPluginsDisabledPluginsExceptions); - pref_change_registrar_.Add(prefs::kPluginsDisabledPluginsExceptions, - PluginUpdater::GetInstance()); - local_state_->RegisterListPref(prefs::kPluginsEnabledPlugins); - pref_change_registrar_.Add(prefs::kPluginsEnabledPlugins, - PluginUpdater::GetInstance()); - print_job_manager_->InitOnUIThread(local_state_.get()); // Initialize the notification for the default browser setting policy. |