| 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/debug/trace_event.h" | 9 #include "base/debug/trace_event.h" |
| 10 #include "base/prefs/pref_registry_simple.h" | 10 #include "base/prefs/pref_registry_simple.h" |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 #include "chrome/browser/prefs/pref_service_syncable.h" | 52 #include "chrome/browser/prefs/pref_service_syncable.h" |
| 53 #include "chrome/browser/prefs/session_startup_pref.h" | 53 #include "chrome/browser/prefs/session_startup_pref.h" |
| 54 #include "chrome/browser/printing/print_dialog_cloud.h" | 54 #include "chrome/browser/printing/print_dialog_cloud.h" |
| 55 #include "chrome/browser/profiles/chrome_version_service.h" | 55 #include "chrome/browser/profiles/chrome_version_service.h" |
| 56 #include "chrome/browser/profiles/profile.h" | 56 #include "chrome/browser/profiles/profile.h" |
| 57 #include "chrome/browser/profiles/profile_impl.h" | 57 #include "chrome/browser/profiles/profile_impl.h" |
| 58 #include "chrome/browser/profiles/profile_info_cache.h" | 58 #include "chrome/browser/profiles/profile_info_cache.h" |
| 59 #include "chrome/browser/profiles/profiles_state.h" | 59 #include "chrome/browser/profiles/profiles_state.h" |
| 60 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h" | 60 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h" |
| 61 #include "chrome/browser/search/search.h" | 61 #include "chrome/browser/search/search.h" |
| 62 #include "chrome/browser/services/gcm/gcm_account_tracker.h" |
| 62 #include "chrome/browser/services/gcm/gcm_profile_service.h" | 63 #include "chrome/browser/services/gcm/gcm_profile_service.h" |
| 63 #include "chrome/browser/signin/signin_manager_factory.h" | 64 #include "chrome/browser/signin/signin_manager_factory.h" |
| 64 #include "chrome/browser/signin/signin_promo.h" | 65 #include "chrome/browser/signin/signin_promo.h" |
| 65 #include "chrome/browser/task_manager/task_manager.h" | 66 #include "chrome/browser/task_manager/task_manager.h" |
| 66 #include "chrome/browser/ui/app_list/app_list_prefs.h" | 67 #include "chrome/browser/ui/app_list/app_list_prefs.h" |
| 67 #include "chrome/browser/ui/app_list/app_list_service.h" | 68 #include "chrome/browser/ui/app_list/app_list_service.h" |
| 68 #include "chrome/browser/ui/browser_ui_prefs.h" | 69 #include "chrome/browser/ui/browser_ui_prefs.h" |
| 69 #include "chrome/browser/ui/navigation_correction_tab_observer.h" | 70 #include "chrome/browser/ui/navigation_correction_tab_observer.h" |
| 70 #include "chrome/browser/ui/network_profile_bubble.h" | 71 #include "chrome/browser/ui/network_profile_bubble.h" |
| 71 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" | 72 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" |
| (...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 456 #else | 457 #else |
| 457 AppShortcutManager::RegisterProfilePrefs(registry); | 458 AppShortcutManager::RegisterProfilePrefs(registry); |
| 458 autofill::GeneratedCreditCardBubbleController::RegisterUserPrefs(registry); | 459 autofill::GeneratedCreditCardBubbleController::RegisterUserPrefs(registry); |
| 459 DeviceIDFetcher::RegisterProfilePrefs(registry); | 460 DeviceIDFetcher::RegisterProfilePrefs(registry); |
| 460 DevToolsWindow::RegisterProfilePrefs(registry); | 461 DevToolsWindow::RegisterProfilePrefs(registry); |
| 461 DriveAppMapping::RegisterProfilePrefs(registry); | 462 DriveAppMapping::RegisterProfilePrefs(registry); |
| 462 extensions::CommandService::RegisterProfilePrefs(registry); | 463 extensions::CommandService::RegisterProfilePrefs(registry); |
| 463 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry); | 464 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry); |
| 464 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry); | 465 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry); |
| 465 first_run::RegisterProfilePrefs(registry); | 466 first_run::RegisterProfilePrefs(registry); |
| 467 gcm::GCMAccountTracker::RegisterProfilePrefs(registry); |
| 466 gcm::GCMChannelStatusSyncer::RegisterProfilePrefs(registry); | 468 gcm::GCMChannelStatusSyncer::RegisterProfilePrefs(registry); |
| 467 NewTabUI::RegisterProfilePrefs(registry); | 469 NewTabUI::RegisterProfilePrefs(registry); |
| 468 PepperFlashSettingsManager::RegisterProfilePrefs(registry); | 470 PepperFlashSettingsManager::RegisterProfilePrefs(registry); |
| 469 PinnedTabCodec::RegisterProfilePrefs(registry); | 471 PinnedTabCodec::RegisterProfilePrefs(registry); |
| 470 PluginsUI::RegisterProfilePrefs(registry); | 472 PluginsUI::RegisterProfilePrefs(registry); |
| 471 RegisterAutolaunchUserPrefs(registry); | 473 RegisterAutolaunchUserPrefs(registry); |
| 472 signin::RegisterProfilePrefs(registry); | 474 signin::RegisterProfilePrefs(registry); |
| 473 #endif | 475 #endif |
| 474 | 476 |
| 475 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) | 477 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 632 #if defined(OS_CHROMEOS) | 634 #if defined(OS_CHROMEOS) |
| 633 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); | 635 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); |
| 634 #endif | 636 #endif |
| 635 | 637 |
| 636 #if defined(TOOLKIT_VIEWS) | 638 #if defined(TOOLKIT_VIEWS) |
| 637 MigrateBrowserTabStripPrefs(local_state); | 639 MigrateBrowserTabStripPrefs(local_state); |
| 638 #endif | 640 #endif |
| 639 } | 641 } |
| 640 | 642 |
| 641 } // namespace chrome | 643 } // namespace chrome |
| OLD | NEW |