| Index: chrome/browser/prefs/browser_prefs.cc
|
| diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
|
| index 9200d5da8e1ef6e6c035b23eccddf37b79b6ff07..f758bb65ddd3ffa334edb2b4af6d38d489eef00e 100644
|
| --- a/chrome/browser/prefs/browser_prefs.cc
|
| +++ b/chrome/browser/prefs/browser_prefs.cc
|
| @@ -15,6 +15,7 @@
|
| #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
|
| #include "chrome/browser/debugger/devtools_manager.h"
|
| #include "chrome/browser/download/download_prefs.h"
|
| +#include "chrome/browser/extensions/apps_promo.h"
|
| #include "chrome/browser/extensions/extension_prefs.h"
|
| #include "chrome/browser/extensions/extension_web_ui.h"
|
| #include "chrome/browser/extensions/extensions_ui.h"
|
| @@ -54,6 +55,7 @@
|
| #include "chrome/browser/ui/webui/new_tab_ui.h"
|
| #include "chrome/browser/ui/webui/plugins_ui.h"
|
| #include "chrome/browser/upgrade_detector.h"
|
| +#include "chrome/browser/web_resource/promo_resource_service.h"
|
| #include "chrome/common/pref_names.h"
|
| #include "content/browser/host_zoom_map.h"
|
|
|
| @@ -81,6 +83,7 @@ namespace browser {
|
|
|
| void RegisterLocalState(PrefService* local_state) {
|
| // Prefs in Local State
|
| + AppsPromo::RegisterPrefs(local_state);
|
| Browser::RegisterPrefs(local_state);
|
| FlagsUI::RegisterPrefs(local_state);
|
| WebCacheManager::RegisterPrefs(local_state);
|
| @@ -90,6 +93,7 @@ void RegisterLocalState(PrefService* local_state) {
|
| KeywordEditorController::RegisterPrefs(local_state);
|
| MetricsLog::RegisterPrefs(local_state);
|
| MetricsService::RegisterPrefs(local_state);
|
| + PromoResourceService::RegisterPrefs(local_state);
|
| SafeBrowsingService::RegisterPrefs(local_state);
|
| browser_shutdown::RegisterPrefs(local_state);
|
| #if defined(TOOLKIT_VIEWS)
|
| @@ -116,6 +120,7 @@ void RegisterLocalState(PrefService* local_state) {
|
|
|
| void RegisterUserPrefs(PrefService* user_prefs) {
|
| // User prefs
|
| + AppsPromo::RegisterUserPrefs(user_prefs);
|
| AutofillManager::RegisterUserPrefs(user_prefs);
|
| SessionStartupPref::RegisterUserPrefs(user_prefs);
|
| Browser::RegisterUserPrefs(user_prefs);
|
| @@ -130,6 +135,7 @@ void RegisterUserPrefs(PrefService* user_prefs) {
|
| NewTabUI::RegisterUserPrefs(user_prefs);
|
| PluginsUI::RegisterUserPrefs(user_prefs);
|
| ProfileImpl::RegisterUserPrefs(user_prefs);
|
| + PromoResourceService::RegisterUserPrefs(user_prefs);
|
| HostContentSettingsMap::RegisterUserPrefs(user_prefs);
|
| HostZoomMap::RegisterUserPrefs(user_prefs);
|
| DevToolsManager::RegisterUserPrefs(user_prefs);
|
|
|