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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
75 #include "chrome/browser/ui/webui/instant_ui.h" | 75 #include "chrome/browser/ui/webui/instant_ui.h" |
76 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" | 76 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" |
77 #include "chrome/browser/ui/webui/plugins_ui.h" | 77 #include "chrome/browser/ui/webui/plugins_ui.h" |
78 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" | 78 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" |
79 #include "chrome/browser/upgrade_detector.h" | 79 #include "chrome/browser/upgrade_detector.h" |
80 #include "chrome/browser/web_resource/promo_resource_service.h" | 80 #include "chrome/browser/web_resource/promo_resource_service.h" |
81 #include "chrome/common/pref_names.h" | 81 #include "chrome/common/pref_names.h" |
82 #include "components/autofill/core/browser/autofill_manager.h" | 82 #include "components/autofill/core/browser/autofill_manager.h" |
83 #include "components/bookmarks/browser/bookmark_utils.h" | 83 #include "components/bookmarks/browser/bookmark_utils.h" |
84 #include "components/dom_distiller/core/distilled_page_prefs.h" | 84 #include "components/dom_distiller/core/distilled_page_prefs.h" |
| 85 #include "components/enhanced_bookmarks/bookmark_server_cluster_service.h" |
85 #include "components/google/core/browser/google_pref_names.h" | 86 #include "components/google/core/browser/google_pref_names.h" |
86 #include "components/google/core/browser/google_url_tracker.h" | 87 #include "components/google/core/browser/google_url_tracker.h" |
87 #include "components/network_time/network_time_tracker.h" | 88 #include "components/network_time/network_time_tracker.h" |
88 #include "components/password_manager/core/browser/password_manager.h" | 89 #include "components/password_manager/core/browser/password_manager.h" |
89 #include "components/pref_registry/pref_registry_syncable.h" | 90 #include "components/pref_registry/pref_registry_syncable.h" |
90 #include "components/rappor/rappor_service.h" | 91 #include "components/rappor/rappor_service.h" |
91 #include "components/search_engines/template_url_prepopulate_data.h" | 92 #include "components/search_engines/template_url_prepopulate_data.h" |
92 #include "components/sync_driver/sync_prefs.h" | 93 #include "components/sync_driver/sync_prefs.h" |
93 #include "components/translate/core/browser/translate_prefs.h" | 94 #include "components/translate/core/browser/translate_prefs.h" |
94 #include "content/public/browser/render_process_host.h" | 95 #include "content/public/browser/render_process_host.h" |
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
362 sync_driver::SyncPrefs::RegisterProfilePrefs(registry); | 363 sync_driver::SyncPrefs::RegisterProfilePrefs(registry); |
363 ChromeContentBrowserClient::RegisterProfilePrefs(registry); | 364 ChromeContentBrowserClient::RegisterProfilePrefs(registry); |
364 ChromeVersionService::RegisterProfilePrefs(registry); | 365 ChromeVersionService::RegisterProfilePrefs(registry); |
365 chrome_browser_net::HttpServerPropertiesManagerFactory::RegisterProfilePrefs( | 366 chrome_browser_net::HttpServerPropertiesManagerFactory::RegisterProfilePrefs( |
366 registry); | 367 registry); |
367 chrome_browser_net::Predictor::RegisterProfilePrefs(registry); | 368 chrome_browser_net::Predictor::RegisterProfilePrefs(registry); |
368 chrome_browser_net::RegisterPredictionOptionsProfilePrefs(registry); | 369 chrome_browser_net::RegisterPredictionOptionsProfilePrefs(registry); |
369 chrome_prefs::RegisterProfilePrefs(registry); | 370 chrome_prefs::RegisterProfilePrefs(registry); |
370 dom_distiller::DistilledPagePrefs::RegisterProfilePrefs(registry); | 371 dom_distiller::DistilledPagePrefs::RegisterProfilePrefs(registry); |
371 DownloadPrefs::RegisterProfilePrefs(registry); | 372 DownloadPrefs::RegisterProfilePrefs(registry); |
| 373 enhanced_bookmarks::BookmarkServerClusterService::RegisterPrefs(registry); |
372 gcm::GCMProfileService::RegisterProfilePrefs(registry); | 374 gcm::GCMProfileService::RegisterProfilePrefs(registry); |
373 HostContentSettingsMap::RegisterProfilePrefs(registry); | 375 HostContentSettingsMap::RegisterProfilePrefs(registry); |
374 IncognitoModePrefs::RegisterProfilePrefs(registry); | 376 IncognitoModePrefs::RegisterProfilePrefs(registry); |
375 InstantUI::RegisterProfilePrefs(registry); | 377 InstantUI::RegisterProfilePrefs(registry); |
376 NavigationCorrectionTabObserver::RegisterProfilePrefs(registry); | 378 NavigationCorrectionTabObserver::RegisterProfilePrefs(registry); |
377 MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry); | 379 MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry); |
378 MediaDeviceIDSalt::RegisterProfilePrefs(registry); | 380 MediaDeviceIDSalt::RegisterProfilePrefs(registry); |
379 MediaStreamDevicesController::RegisterProfilePrefs(registry); | 381 MediaStreamDevicesController::RegisterProfilePrefs(registry); |
380 NetPrefObserver::RegisterProfilePrefs(registry); | 382 NetPrefObserver::RegisterProfilePrefs(registry); |
381 password_manager::PasswordManager::RegisterProfilePrefs(registry); | 383 password_manager::PasswordManager::RegisterProfilePrefs(registry); |
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
607 #if defined(OS_CHROMEOS) | 609 #if defined(OS_CHROMEOS) |
608 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); | 610 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); |
609 #endif | 611 #endif |
610 | 612 |
611 #if defined(TOOLKIT_VIEWS) | 613 #if defined(TOOLKIT_VIEWS) |
612 MigrateBrowserTabStripPrefs(local_state); | 614 MigrateBrowserTabStripPrefs(local_state); |
613 #endif | 615 #endif |
614 } | 616 } |
615 | 617 |
616 } // namespace chrome | 618 } // namespace chrome |
OLD | NEW |