diff options
| author | mrossetti@chromium.org <mrossetti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-11 17:32:37 +0000 |
|---|---|---|
| committer | mrossetti@chromium.org <mrossetti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-11 17:32:37 +0000 |
| commit | ebb32fb8f687a7cbc48934dd5c03d865e72afd5a (patch) | |
| tree | 36dd0a1bd9101e6b510b139b69b27ad4fd56c040 /chrome/browser/prefs | |
| parent | 9cc493fe559c45258060464f7a892fae0cc9c16e (diff) | |
| download | chromium_src-ebb32fb8f687a7cbc48934dd5c03d865e72afd5a.zip chromium_src-ebb32fb8f687a7cbc48934dd5c03d865e72afd5a.tar.gz chromium_src-ebb32fb8f687a7cbc48934dd5c03d865e72afd5a.tar.bz2 | |
Revert 96409 - Speculatively revert r96364, it's the best bet on the NaCL breakage.
TEST=
BUG=
TBR=bauerb@chromium.org,mnissler@chromium.org
Review URL: http://codereview.chromium.org/7627001
TBR=mnissler@chromium.org
Review URL: http://codereview.chromium.org/7618013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96411 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs')
| -rw-r--r-- | chrome/browser/prefs/browser_prefs.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index 4bc07cd..60fae12 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -36,7 +36,7 @@ #include "chrome/browser/notifications/notification_ui_manager.h" #include "chrome/browser/page_info_model.h" #include "chrome/browser/password_manager/password_manager.h" -#include "chrome/browser/plugin_updater.h" +#include "chrome/browser/plugin_prefs.h" #include "chrome/browser/policy/cloud_policy_subsystem.h" #include "chrome/browser/prefs/incognito_mode_prefs.h" #include "chrome/browser/prefs/session_startup_pref.h" @@ -156,8 +156,8 @@ void RegisterUserPrefs(PrefService* user_prefs) { ExtensionsUI::RegisterUserPrefs(user_prefs); IncognitoModePrefs::RegisterUserPrefs(user_prefs); NewTabUI::RegisterUserPrefs(user_prefs); + PluginPrefs::RegisterPrefs(user_prefs); PluginsUI::RegisterUserPrefs(user_prefs); - PluginUpdater::RegisterPrefs(user_prefs); ProfileImpl::RegisterUserPrefs(user_prefs); PromoResourceService::RegisterUserPrefs(user_prefs); HostContentSettingsMap::RegisterUserPrefs(user_prefs); |