| 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 <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/metrics/histogram_macros.h" | 9 #include "base/metrics/histogram_macros.h" |
| 10 #include "base/prefs/pref_registry_simple.h" | 10 #include "base/prefs/pref_registry_simple.h" |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 140 | 140 |
| 141 #if defined(ENABLE_SERVICE_DISCOVERY) | 141 #if defined(ENABLE_SERVICE_DISCOVERY) |
| 142 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h" | 142 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h" |
| 143 #endif | 143 #endif |
| 144 | 144 |
| 145 #if defined(OS_ANDROID) | 145 #if defined(OS_ANDROID) |
| 146 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" | 146 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" |
| 147 #include "chrome/browser/android/new_tab_page_prefs.h" | 147 #include "chrome/browser/android/new_tab_page_prefs.h" |
| 148 #else | 148 #else |
| 149 #include "chrome/browser/profile_resetter/automatic_profile_resetter_factory.h" | 149 #include "chrome/browser/profile_resetter/automatic_profile_resetter_factory.h" |
| 150 #include "chrome/browser/ui/autofill/generated_credit_card_bubble_controller.h" | |
| 151 #include "chrome/browser/ui/startup/startup_browser_creator.h" | 150 #include "chrome/browser/ui/startup/startup_browser_creator.h" |
| 152 #endif | 151 #endif |
| 153 | 152 |
| 154 #if !defined(OS_ANDROID) && !defined(OS_IOS) | 153 #if !defined(OS_ANDROID) && !defined(OS_IOS) |
| 155 #include "chrome/browser/signin/signin_promo.h" | 154 #include "chrome/browser/signin/signin_promo.h" |
| 156 #include "chrome/browser/ui/webui/foreign_session_handler.h" | 155 #include "chrome/browser/ui/webui/foreign_session_handler.h" |
| 157 #endif | 156 #endif |
| 158 | 157 |
| 159 #if defined(OS_CHROMEOS) | 158 #if defined(OS_CHROMEOS) |
| 160 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" | 159 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" |
| (...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 460 SupervisedUserService::RegisterProfilePrefs(registry); | 459 SupervisedUserService::RegisterProfilePrefs(registry); |
| 461 SupervisedUserWhitelistService::RegisterProfilePrefs(registry); | 460 SupervisedUserWhitelistService::RegisterProfilePrefs(registry); |
| 462 #endif | 461 #endif |
| 463 | 462 |
| 464 #if defined(OS_ANDROID) | 463 #if defined(OS_ANDROID) |
| 465 chrome_variations::VariationsService::RegisterProfilePrefs(registry); | 464 chrome_variations::VariationsService::RegisterProfilePrefs(registry); |
| 466 NewTabPagePrefs::RegisterProfilePrefs(registry); | 465 NewTabPagePrefs::RegisterProfilePrefs(registry); |
| 467 PartnerBookmarksShim::RegisterProfilePrefs(registry); | 466 PartnerBookmarksShim::RegisterProfilePrefs(registry); |
| 468 #else | 467 #else |
| 469 AppShortcutManager::RegisterProfilePrefs(registry); | 468 AppShortcutManager::RegisterProfilePrefs(registry); |
| 470 autofill::GeneratedCreditCardBubbleController::RegisterUserPrefs(registry); | |
| 471 DeviceIDFetcher::RegisterProfilePrefs(registry); | 469 DeviceIDFetcher::RegisterProfilePrefs(registry); |
| 472 DevToolsWindow::RegisterProfilePrefs(registry); | 470 DevToolsWindow::RegisterProfilePrefs(registry); |
| 473 DriveAppMapping::RegisterProfilePrefs(registry); | 471 DriveAppMapping::RegisterProfilePrefs(registry); |
| 474 extensions::CommandService::RegisterProfilePrefs(registry); | 472 extensions::CommandService::RegisterProfilePrefs(registry); |
| 475 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry); | 473 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry); |
| 476 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry); | 474 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry); |
| 477 first_run::RegisterProfilePrefs(registry); | 475 first_run::RegisterProfilePrefs(registry); |
| 478 gcm::GCMChannelStatusSyncer::RegisterProfilePrefs(registry); | 476 gcm::GCMChannelStatusSyncer::RegisterProfilePrefs(registry); |
| 479 NewTabUI::RegisterProfilePrefs(registry); | 477 NewTabUI::RegisterProfilePrefs(registry); |
| 480 PepperFlashSettingsManager::RegisterProfilePrefs(registry); | 478 PepperFlashSettingsManager::RegisterProfilePrefs(registry); |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 577 chrome_browser_net::MigrateNetworkPredictionUserPrefs(profile_prefs); | 575 chrome_browser_net::MigrateNetworkPredictionUserPrefs(profile_prefs); |
| 578 #endif | 576 #endif |
| 579 | 577 |
| 580 #if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST) | 578 #if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST) |
| 581 // Added 02/2015. | 579 // Added 02/2015. |
| 582 MigrateGoogleNowPrefs(profile); | 580 MigrateGoogleNowPrefs(profile); |
| 583 #endif | 581 #endif |
| 584 } | 582 } |
| 585 | 583 |
| 586 } // namespace chrome | 584 } // namespace chrome |
| OLD | NEW |