| 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/trace_event/trace_event.h" | 10 #include "base/trace_event/trace_event.h" |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 #include "chrome/browser/pepper_flash_settings_manager.h" | 39 #include "chrome/browser/pepper_flash_settings_manager.h" |
| 40 #include "chrome/browser/plugins/plugin_finder.h" | 40 #include "chrome/browser/plugins/plugin_finder.h" |
| 41 #include "chrome/browser/prefs/chrome_pref_service_factory.h" | 41 #include "chrome/browser/prefs/chrome_pref_service_factory.h" |
| 42 #include "chrome/browser/prefs/incognito_mode_prefs.h" | 42 #include "chrome/browser/prefs/incognito_mode_prefs.h" |
| 43 #include "chrome/browser/prefs/session_startup_pref.h" | 43 #include "chrome/browser/prefs/session_startup_pref.h" |
| 44 #include "chrome/browser/profiles/chrome_version_service.h" | 44 #include "chrome/browser/profiles/chrome_version_service.h" |
| 45 #include "chrome/browser/profiles/profile.h" | 45 #include "chrome/browser/profiles/profile.h" |
| 46 #include "chrome/browser/profiles/profile_impl.h" | 46 #include "chrome/browser/profiles/profile_impl.h" |
| 47 #include "chrome/browser/profiles/profile_info_cache.h" | 47 #include "chrome/browser/profiles/profile_info_cache.h" |
| 48 #include "chrome/browser/profiles/profiles_state.h" | 48 #include "chrome/browser/profiles/profiles_state.h" |
| 49 #include "chrome/browser/push_messaging/background_budget_service.h" |
| 49 #include "chrome/browser/push_messaging/push_messaging_app_identifier.h" | 50 #include "chrome/browser/push_messaging/push_messaging_app_identifier.h" |
| 50 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h" | 51 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h" |
| 51 #include "chrome/browser/search/search.h" | 52 #include "chrome/browser/search/search.h" |
| 52 #include "chrome/browser/signin/signin_manager_factory.h" | 53 #include "chrome/browser/signin/signin_manager_factory.h" |
| 53 #include "chrome/browser/task_manager/task_manager.h" | 54 #include "chrome/browser/task_manager/task_manager.h" |
| 54 #include "chrome/browser/tracing/chrome_tracing_delegate.h" | 55 #include "chrome/browser/tracing/chrome_tracing_delegate.h" |
| 55 #include "chrome/browser/ui/app_list/app_list_prefs.h" | 56 #include "chrome/browser/ui/app_list/app_list_prefs.h" |
| 56 #include "chrome/browser/ui/app_list/app_list_service.h" | 57 #include "chrome/browser/ui/app_list/app_list_service.h" |
| 57 #include "chrome/browser/ui/browser_ui_prefs.h" | 58 #include "chrome/browser/ui/browser_ui_prefs.h" |
| 58 #include "chrome/browser/ui/navigation_correction_tab_observer.h" | 59 #include "chrome/browser/ui/navigation_correction_tab_observer.h" |
| (...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 403 RegisterBrowserViewLocalPrefs(registry); | 404 RegisterBrowserViewLocalPrefs(registry); |
| 404 #endif | 405 #endif |
| 405 } | 406 } |
| 406 | 407 |
| 407 // Register prefs applicable to all profiles. | 408 // Register prefs applicable to all profiles. |
| 408 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { | 409 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { |
| 409 TRACE_EVENT0("browser", "chrome::RegisterProfilePrefs"); | 410 TRACE_EVENT0("browser", "chrome::RegisterProfilePrefs"); |
| 410 SCOPED_UMA_HISTOGRAM_TIMER("Settings.RegisterProfilePrefsTime"); | 411 SCOPED_UMA_HISTOGRAM_TIMER("Settings.RegisterProfilePrefsTime"); |
| 411 // User prefs. Please keep this list alphabetized. | 412 // User prefs. Please keep this list alphabetized. |
| 412 autofill::AutofillManager::RegisterProfilePrefs(registry); | 413 autofill::AutofillManager::RegisterProfilePrefs(registry); |
| 414 BackgroundBudgetService::RegisterProfilePrefs(registry); |
| 413 sync_driver::SyncPrefs::RegisterProfilePrefs(registry); | 415 sync_driver::SyncPrefs::RegisterProfilePrefs(registry); |
| 414 ChromeContentBrowserClient::RegisterProfilePrefs(registry); | 416 ChromeContentBrowserClient::RegisterProfilePrefs(registry); |
| 415 ChromeVersionService::RegisterProfilePrefs(registry); | 417 ChromeVersionService::RegisterProfilePrefs(registry); |
| 416 chrome_browser_net::HttpServerPropertiesManagerFactory::RegisterProfilePrefs( | 418 chrome_browser_net::HttpServerPropertiesManagerFactory::RegisterProfilePrefs( |
| 417 registry); | 419 registry); |
| 418 chrome_browser_net::Predictor::RegisterProfilePrefs(registry); | 420 chrome_browser_net::Predictor::RegisterProfilePrefs(registry); |
| 419 chrome_browser_net::RegisterPredictionOptionsProfilePrefs(registry); | 421 chrome_browser_net::RegisterPredictionOptionsProfilePrefs(registry); |
| 420 chrome_prefs::RegisterProfilePrefs(registry); | 422 chrome_prefs::RegisterProfilePrefs(registry); |
| 421 dom_distiller::DistilledPagePrefs::RegisterProfilePrefs(registry); | 423 dom_distiller::DistilledPagePrefs::RegisterProfilePrefs(registry); |
| 422 DownloadPrefs::RegisterProfilePrefs(registry); | 424 DownloadPrefs::RegisterProfilePrefs(registry); |
| (...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 669 profile_prefs->ClearPref(kOverscrollVerticalResistThreshold); | 671 profile_prefs->ClearPref(kOverscrollVerticalResistThreshold); |
| 670 #endif // defined(USE_AURA) | 672 #endif // defined(USE_AURA) |
| 671 | 673 |
| 672 #if BUILDFLAG(ENABLE_GOOGLE_NOW) | 674 #if BUILDFLAG(ENABLE_GOOGLE_NOW) |
| 673 // Added 3/2016. | 675 // Added 3/2016. |
| 674 profile_prefs->ClearPref(kGoogleGeolocationAccessEnabled); | 676 profile_prefs->ClearPref(kGoogleGeolocationAccessEnabled); |
| 675 #endif | 677 #endif |
| 676 } | 678 } |
| 677 | 679 |
| 678 } // namespace chrome | 680 } // namespace chrome |
| OLD | NEW |