OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/prefs/browser_prefs.h" | 5 #include "chrome/browser/prefs/browser_prefs.h" |
6 | 6 |
7 #include "apps/prefs.h" | 7 #include "apps/prefs.h" |
8 #include "base/debug/trace_event.h" | 8 #include "base/debug/trace_event.h" |
9 #include "base/prefs/pref_registry_simple.h" | 9 #include "base/prefs/pref_registry_simple.h" |
10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
120 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h" | 120 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h" |
121 #endif | 121 #endif |
122 | 122 |
123 #if defined(ENABLE_PLUGIN_INSTALLATION) | 123 #if defined(ENABLE_PLUGIN_INSTALLATION) |
124 #include "chrome/browser/plugins/plugins_resource_service.h" | 124 #include "chrome/browser/plugins/plugins_resource_service.h" |
125 #endif | 125 #endif |
126 | 126 |
127 #if defined(OS_ANDROID) | 127 #if defined(OS_ANDROID) |
128 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" | 128 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" |
129 #include "chrome/browser/android/new_tab_page_prefs.h" | 129 #include "chrome/browser/android/new_tab_page_prefs.h" |
130 #include "chrome/browser/ui/webui/ntp/android/promo_handler.h" | |
131 #else | 130 #else |
132 #include "chrome/browser/notifications/sync_notifier/chrome_notifier_service.h" | 131 #include "chrome/browser/notifications/sync_notifier/chrome_notifier_service.h" |
133 #include "chrome/browser/profile_resetter/automatic_profile_resetter_factory.h" | 132 #include "chrome/browser/profile_resetter/automatic_profile_resetter_factory.h" |
134 #include "chrome/browser/ui/autofill/generated_credit_card_bubble_controller.h" | 133 #include "chrome/browser/ui/autofill/generated_credit_card_bubble_controller.h" |
135 #endif | 134 #endif |
136 | 135 |
137 #if defined(OS_CHROMEOS) | 136 #if defined(OS_CHROMEOS) |
138 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" | 137 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" |
139 #include "chrome/browser/chromeos/attestation/platform_verification_flow.h" | 138 #include "chrome/browser/chromeos/attestation/platform_verification_flow.h" |
140 #include "chrome/browser/chromeos/audio/audio_devices_pref_handler_impl.h" | 139 #include "chrome/browser/chromeos/audio/audio_devices_pref_handler_impl.h" |
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
353 ExtensionWebUI::RegisterProfilePrefs(registry); | 352 ExtensionWebUI::RegisterProfilePrefs(registry); |
354 HostContentSettingsMap::RegisterProfilePrefs(registry); | 353 HostContentSettingsMap::RegisterProfilePrefs(registry); |
355 IncognitoModePrefs::RegisterProfilePrefs(registry); | 354 IncognitoModePrefs::RegisterProfilePrefs(registry); |
356 InstantUI::RegisterProfilePrefs(registry); | 355 InstantUI::RegisterProfilePrefs(registry); |
357 NavigationCorrectionTabObserver::RegisterProfilePrefs(registry); | 356 NavigationCorrectionTabObserver::RegisterProfilePrefs(registry); |
358 MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry); | 357 MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry); |
359 MediaDeviceIDSalt::RegisterProfilePrefs(registry); | 358 MediaDeviceIDSalt::RegisterProfilePrefs(registry); |
360 MediaStreamDevicesController::RegisterProfilePrefs(registry); | 359 MediaStreamDevicesController::RegisterProfilePrefs(registry); |
361 NetPrefObserver::RegisterProfilePrefs(registry); | 360 NetPrefObserver::RegisterProfilePrefs(registry); |
362 NetworkTimeService::RegisterProfilePrefs(registry); | 361 NetworkTimeService::RegisterProfilePrefs(registry); |
363 NewTabUI::RegisterProfilePrefs(registry); | 362 |
364 password_manager::PasswordManager::RegisterProfilePrefs(registry); | 363 password_manager::PasswordManager::RegisterProfilePrefs(registry); |
365 PrefProxyConfigTrackerImpl::RegisterProfilePrefs(registry); | 364 PrefProxyConfigTrackerImpl::RegisterProfilePrefs(registry); |
366 PrefsTabHelper::RegisterProfilePrefs(registry); | 365 PrefsTabHelper::RegisterProfilePrefs(registry); |
367 Profile::RegisterProfilePrefs(registry); | 366 Profile::RegisterProfilePrefs(registry); |
368 ProfileImpl::RegisterProfilePrefs(registry); | 367 ProfileImpl::RegisterProfilePrefs(registry); |
369 PromoResourceService::RegisterProfilePrefs(registry); | 368 PromoResourceService::RegisterProfilePrefs(registry); |
370 ProtocolHandlerRegistry::RegisterProfilePrefs(registry); | 369 ProtocolHandlerRegistry::RegisterProfilePrefs(registry); |
371 RegisterBrowserUserPrefs(registry); | 370 RegisterBrowserUserPrefs(registry); |
372 SessionStartupPref::RegisterProfilePrefs(registry); | 371 SessionStartupPref::RegisterProfilePrefs(registry); |
373 TemplateURLPrepopulateData::RegisterProfilePrefs(registry); | 372 TemplateURLPrepopulateData::RegisterProfilePrefs(registry); |
(...skipping 28 matching lines...) Expand all Loading... |
402 #endif | 401 #endif |
403 | 402 |
404 #if defined(ENABLE_SERVICE_DISCOVERY) | 403 #if defined(ENABLE_SERVICE_DISCOVERY) |
405 LocalDiscoveryUI::RegisterProfilePrefs(registry); | 404 LocalDiscoveryUI::RegisterProfilePrefs(registry); |
406 #endif | 405 #endif |
407 | 406 |
408 #if defined(OS_ANDROID) | 407 #if defined(OS_ANDROID) |
409 chrome_variations::VariationsService::RegisterProfilePrefs(registry); | 408 chrome_variations::VariationsService::RegisterProfilePrefs(registry); |
410 NewTabPagePrefs::RegisterProfilePrefs(registry); | 409 NewTabPagePrefs::RegisterProfilePrefs(registry); |
411 PartnerBookmarksShim::RegisterProfilePrefs(registry); | 410 PartnerBookmarksShim::RegisterProfilePrefs(registry); |
412 PromoHandler::RegisterProfilePrefs(registry); | |
413 #else | 411 #else |
414 AppShortcutManager::RegisterProfilePrefs(registry); | 412 AppShortcutManager::RegisterProfilePrefs(registry); |
415 autofill::GeneratedCreditCardBubbleController::RegisterUserPrefs(registry); | 413 autofill::GeneratedCreditCardBubbleController::RegisterUserPrefs(registry); |
416 DeviceIDFetcher::RegisterProfilePrefs(registry); | 414 DeviceIDFetcher::RegisterProfilePrefs(registry); |
417 DevToolsWindow::RegisterProfilePrefs(registry); | 415 DevToolsWindow::RegisterProfilePrefs(registry); |
418 extensions::CommandService::RegisterProfilePrefs(registry); | 416 extensions::CommandService::RegisterProfilePrefs(registry); |
419 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry); | 417 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry); |
420 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry); | 418 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry); |
421 first_run::RegisterProfilePrefs(registry); | 419 first_run::RegisterProfilePrefs(registry); |
| 420 NewTabUI::RegisterProfilePrefs(registry); |
422 notifier::ChromeNotifierService::RegisterProfilePrefs(registry); | 421 notifier::ChromeNotifierService::RegisterProfilePrefs(registry); |
423 PepperFlashSettingsManager::RegisterProfilePrefs(registry); | 422 PepperFlashSettingsManager::RegisterProfilePrefs(registry); |
424 PinnedTabCodec::RegisterProfilePrefs(registry); | 423 PinnedTabCodec::RegisterProfilePrefs(registry); |
425 PluginsUI::RegisterProfilePrefs(registry); | 424 PluginsUI::RegisterProfilePrefs(registry); |
426 RegisterAutolaunchUserPrefs(registry); | 425 RegisterAutolaunchUserPrefs(registry); |
427 signin::RegisterProfilePrefs(registry); | 426 signin::RegisterProfilePrefs(registry); |
428 #endif | 427 #endif |
429 | 428 |
430 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) | 429 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) |
431 default_apps::RegisterProfilePrefs(registry); | 430 default_apps::RegisterProfilePrefs(registry); |
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
576 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 575 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
577 current_version); | 576 current_version); |
578 } | 577 } |
579 | 578 |
580 #if defined(OS_CHROMEOS) | 579 #if defined(OS_CHROMEOS) |
581 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); | 580 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); |
582 #endif | 581 #endif |
583 } | 582 } |
584 | 583 |
585 } // namespace chrome | 584 } // namespace chrome |
OLD | NEW |