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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
53 #include "chrome/browser/profiles/chrome_version_service.h" | 53 #include "chrome/browser/profiles/chrome_version_service.h" |
54 #include "chrome/browser/profiles/profile.h" | 54 #include "chrome/browser/profiles/profile.h" |
55 #include "chrome/browser/profiles/profile_impl.h" | 55 #include "chrome/browser/profiles/profile_impl.h" |
56 #include "chrome/browser/profiles/profile_info_cache.h" | 56 #include "chrome/browser/profiles/profile_info_cache.h" |
57 #include "chrome/browser/profiles/profiles_state.h" | 57 #include "chrome/browser/profiles/profiles_state.h" |
58 #include "chrome/browser/push_messaging/push_messaging_service_impl.h" | 58 #include "chrome/browser/push_messaging/push_messaging_service_impl.h" |
59 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h" | 59 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h" |
60 #include "chrome/browser/search/search.h" | 60 #include "chrome/browser/search/search.h" |
61 #include "chrome/browser/signin/signin_manager_factory.h" | 61 #include "chrome/browser/signin/signin_manager_factory.h" |
62 #include "chrome/browser/task_manager/task_manager.h" | 62 #include "chrome/browser/task_manager/task_manager.h" |
| 63 #include "chrome/browser/tracing/chrome_tracing_delegate.h" |
63 #include "chrome/browser/ui/app_list/app_list_prefs.h" | 64 #include "chrome/browser/ui/app_list/app_list_prefs.h" |
64 #include "chrome/browser/ui/app_list/app_list_service.h" | 65 #include "chrome/browser/ui/app_list/app_list_service.h" |
65 #include "chrome/browser/ui/browser_ui_prefs.h" | 66 #include "chrome/browser/ui/browser_ui_prefs.h" |
66 #include "chrome/browser/ui/navigation_correction_tab_observer.h" | 67 #include "chrome/browser/ui/navigation_correction_tab_observer.h" |
67 #include "chrome/browser/ui/network_profile_bubble.h" | 68 #include "chrome/browser/ui/network_profile_bubble.h" |
68 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" | 69 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" |
69 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" | 70 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" |
70 #include "chrome/browser/ui/startup/autolaunch_prompt.h" | 71 #include "chrome/browser/ui/startup/autolaunch_prompt.h" |
71 #include "chrome/browser/ui/startup/default_browser_prompt.h" | 72 #include "chrome/browser/ui/startup/default_browser_prompt.h" |
72 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" | 73 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" |
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
255 GpuModeManager::RegisterPrefs(registry); | 256 GpuModeManager::RegisterPrefs(registry); |
256 IntranetRedirectDetector::RegisterPrefs(registry); | 257 IntranetRedirectDetector::RegisterPrefs(registry); |
257 IOThread::RegisterPrefs(registry); | 258 IOThread::RegisterPrefs(registry); |
258 network_time::NetworkTimeTracker::RegisterPrefs(registry); | 259 network_time::NetworkTimeTracker::RegisterPrefs(registry); |
259 PrefProxyConfigTrackerImpl::RegisterPrefs(registry); | 260 PrefProxyConfigTrackerImpl::RegisterPrefs(registry); |
260 ProfileInfoCache::RegisterPrefs(registry); | 261 ProfileInfoCache::RegisterPrefs(registry); |
261 profiles::RegisterPrefs(registry); | 262 profiles::RegisterPrefs(registry); |
262 PromoResourceService::RegisterPrefs(registry); | 263 PromoResourceService::RegisterPrefs(registry); |
263 rappor::RapporService::RegisterPrefs(registry); | 264 rappor::RapporService::RegisterPrefs(registry); |
264 RegisterScreenshotPrefs(registry); | 265 RegisterScreenshotPrefs(registry); |
| 266 RegisterTracingPrefs(registry); |
265 SigninManagerFactory::RegisterPrefs(registry); | 267 SigninManagerFactory::RegisterPrefs(registry); |
266 SSLConfigServiceManager::RegisterPrefs(registry); | 268 SSLConfigServiceManager::RegisterPrefs(registry); |
267 UpgradeDetector::RegisterPrefs(registry); | 269 UpgradeDetector::RegisterPrefs(registry); |
268 | 270 |
269 #if defined(ENABLE_AUTOFILL_DIALOG) | 271 #if defined(ENABLE_AUTOFILL_DIALOG) |
270 autofill::AutofillDialogController::RegisterPrefs(registry); | 272 autofill::AutofillDialogController::RegisterPrefs(registry); |
271 #endif | 273 #endif |
272 | 274 |
273 #if defined(ENABLE_CONFIGURATION_POLICY) | 275 #if defined(ENABLE_CONFIGURATION_POLICY) |
274 policy::BrowserPolicyConnector::RegisterPrefs(registry); | 276 policy::BrowserPolicyConnector::RegisterPrefs(registry); |
(...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
626 host_zoom_dictionary, false /* sanitize_partition_host_zoom_levels */); | 628 host_zoom_dictionary, false /* sanitize_partition_host_zoom_levels */); |
627 | 629 |
628 // We're done migrating the profile per-host zoom level values, so we clear | 630 // We're done migrating the profile per-host zoom level values, so we clear |
629 // them all. | 631 // them all. |
630 DictionaryPrefUpdate host_zoom_dictionary_update( | 632 DictionaryPrefUpdate host_zoom_dictionary_update( |
631 prefs, prefs::kPerHostZoomLevelsDeprecated); | 633 prefs, prefs::kPerHostZoomLevelsDeprecated); |
632 host_zoom_dictionary_update->Clear(); | 634 host_zoom_dictionary_update->Clear(); |
633 } | 635 } |
634 | 636 |
635 } // namespace chrome | 637 } // namespace chrome |
OLD | NEW |