diff options
| author | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-11 17:06:45 +0000 |
|---|---|---|
| committer | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-11 17:06:45 +0000 |
| commit | 9cc493fe559c45258060464f7a892fae0cc9c16e (patch) | |
| tree | ef07d496fe314527a37b0fe45c42c1b93b01c41e /chrome/browser/prefs | |
| parent | 7cf127e24d03711073a98105d9ad9f0329ddb8f4 (diff) | |
| download | chromium_src-9cc493fe559c45258060464f7a892fae0cc9c16e.zip chromium_src-9cc493fe559c45258060464f7a892fae0cc9c16e.tar.gz chromium_src-9cc493fe559c45258060464f7a892fae0cc9c16e.tar.bz2 | |
Speculatively revert r96364, it's the best bet on the NaCL breakage.
TEST=
BUG=
TBR=bauerb@chromium.org
Review URL: http://codereview.chromium.org/7627001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96409 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 60fae12..4bc07cd 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_prefs.h" +#include "chrome/browser/plugin_updater.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); |