| 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" | 
| 11 #include "chrome/browser/about_flags.h" | 11 #include "chrome/browser/about_flags.h" | 
| 12 #include "chrome/browser/accessibility/invert_bubble_prefs.h" | 12 #include "chrome/browser/accessibility/invert_bubble_prefs.h" | 
|  | 13 #include "chrome/browser/apps/drive/drive_app_mapping.h" | 
| 13 #include "chrome/browser/apps/shortcut_manager.h" | 14 #include "chrome/browser/apps/shortcut_manager.h" | 
| 14 #include "chrome/browser/autocomplete/zero_suggest_provider.h" | 15 #include "chrome/browser/autocomplete/zero_suggest_provider.h" | 
| 15 #include "chrome/browser/background/background_mode_manager.h" | 16 #include "chrome/browser/background/background_mode_manager.h" | 
| 16 #include "chrome/browser/browser_process_impl.h" | 17 #include "chrome/browser/browser_process_impl.h" | 
| 17 #include "chrome/browser/browser_shutdown.h" | 18 #include "chrome/browser/browser_shutdown.h" | 
| 18 #include "chrome/browser/chrome_content_browser_client.h" | 19 #include "chrome/browser/chrome_content_browser_client.h" | 
| 19 #include "chrome/browser/component_updater/recovery_component_installer.h" | 20 #include "chrome/browser/component_updater/recovery_component_installer.h" | 
| 20 #include "chrome/browser/content_settings/host_content_settings_map.h" | 21 #include "chrome/browser/content_settings/host_content_settings_map.h" | 
| 21 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" | 22 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" | 
| 22 #include "chrome/browser/devtools/devtools_window.h" | 23 #include "chrome/browser/devtools/devtools_window.h" | 
| (...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 405 | 406 | 
| 406 #if defined(OS_ANDROID) | 407 #if defined(OS_ANDROID) | 
| 407   chrome_variations::VariationsService::RegisterProfilePrefs(registry); | 408   chrome_variations::VariationsService::RegisterProfilePrefs(registry); | 
| 408   NewTabPagePrefs::RegisterProfilePrefs(registry); | 409   NewTabPagePrefs::RegisterProfilePrefs(registry); | 
| 409   PartnerBookmarksShim::RegisterProfilePrefs(registry); | 410   PartnerBookmarksShim::RegisterProfilePrefs(registry); | 
| 410 #else | 411 #else | 
| 411   AppShortcutManager::RegisterProfilePrefs(registry); | 412   AppShortcutManager::RegisterProfilePrefs(registry); | 
| 412   autofill::GeneratedCreditCardBubbleController::RegisterUserPrefs(registry); | 413   autofill::GeneratedCreditCardBubbleController::RegisterUserPrefs(registry); | 
| 413   DeviceIDFetcher::RegisterProfilePrefs(registry); | 414   DeviceIDFetcher::RegisterProfilePrefs(registry); | 
| 414   DevToolsWindow::RegisterProfilePrefs(registry); | 415   DevToolsWindow::RegisterProfilePrefs(registry); | 
|  | 416   DriveAppMapping::RegisterProfilePrefs(registry); | 
| 415   extensions::CommandService::RegisterProfilePrefs(registry); | 417   extensions::CommandService::RegisterProfilePrefs(registry); | 
| 416   extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry); | 418   extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry); | 
| 417   extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry); | 419   extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry); | 
| 418   first_run::RegisterProfilePrefs(registry); | 420   first_run::RegisterProfilePrefs(registry); | 
| 419   NewTabUI::RegisterProfilePrefs(registry); | 421   NewTabUI::RegisterProfilePrefs(registry); | 
| 420   notifier::ChromeNotifierService::RegisterProfilePrefs(registry); | 422   notifier::ChromeNotifierService::RegisterProfilePrefs(registry); | 
| 421   PepperFlashSettingsManager::RegisterProfilePrefs(registry); | 423   PepperFlashSettingsManager::RegisterProfilePrefs(registry); | 
| 422   PinnedTabCodec::RegisterProfilePrefs(registry); | 424   PinnedTabCodec::RegisterProfilePrefs(registry); | 
| 423   PluginsUI::RegisterProfilePrefs(registry); | 425   PluginsUI::RegisterProfilePrefs(registry); | 
| 424   RegisterAutolaunchUserPrefs(registry); | 426   RegisterAutolaunchUserPrefs(registry); | 
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 579 #if defined(OS_CHROMEOS) | 581 #if defined(OS_CHROMEOS) | 
| 580   chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); | 582   chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); | 
| 581 #endif | 583 #endif | 
| 582 | 584 | 
| 583 #if defined(TOOLKIT_VIEWS) | 585 #if defined(TOOLKIT_VIEWS) | 
| 584   MigrateBrowserTabStripPrefs(local_state); | 586   MigrateBrowserTabStripPrefs(local_state); | 
| 585 #endif | 587 #endif | 
| 586 } | 588 } | 
| 587 | 589 | 
| 588 }  // namespace chrome | 590 }  // namespace chrome | 
| OLD | NEW | 
|---|