| 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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 #include "chrome/browser/tracing/chrome_tracing_delegate.h" | 61 #include "chrome/browser/tracing/chrome_tracing_delegate.h" |
| 62 #include "chrome/browser/ui/app_list/app_list_prefs.h" | 62 #include "chrome/browser/ui/app_list/app_list_prefs.h" |
| 63 #include "chrome/browser/ui/app_list/app_list_service.h" | 63 #include "chrome/browser/ui/app_list/app_list_service.h" |
| 64 #include "chrome/browser/ui/browser_ui_prefs.h" | 64 #include "chrome/browser/ui/browser_ui_prefs.h" |
| 65 #include "chrome/browser/ui/navigation_correction_tab_observer.h" | 65 #include "chrome/browser/ui/navigation_correction_tab_observer.h" |
| 66 #include "chrome/browser/ui/network_profile_bubble.h" | 66 #include "chrome/browser/ui/network_profile_bubble.h" |
| 67 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" | 67 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" |
| 68 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" | 68 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" |
| 69 #include "chrome/browser/ui/startup/autolaunch_prompt.h" | 69 #include "chrome/browser/ui/startup/autolaunch_prompt.h" |
| 70 #include "chrome/browser/ui/startup/default_browser_prompt.h" | 70 #include "chrome/browser/ui/startup/default_browser_prompt.h" |
| 71 #include "chrome/browser/ui/startup/startup_browser_creator.h" |
| 71 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" | 72 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" |
| 72 #include "chrome/browser/ui/webui/flags_ui.h" | 73 #include "chrome/browser/ui/webui/flags_ui.h" |
| 73 #include "chrome/browser/ui/webui/instant_ui.h" | 74 #include "chrome/browser/ui/webui/instant_ui.h" |
| 74 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" | 75 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" |
| 75 #include "chrome/browser/ui/webui/plugins_ui.h" | 76 #include "chrome/browser/ui/webui/plugins_ui.h" |
| 76 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" | 77 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" |
| 77 #include "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h" | 78 #include "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h" |
| 78 #include "chrome/browser/upgrade_detector.h" | 79 #include "chrome/browser/upgrade_detector.h" |
| 79 #include "chrome/browser/web_resource/promo_resource_service.h" | 80 #include "chrome/browser/web_resource/promo_resource_service.h" |
| 80 #include "chrome/common/pref_names.h" | 81 #include "chrome/common/pref_names.h" |
| (...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 259 IOThread::RegisterPrefs(registry); | 260 IOThread::RegisterPrefs(registry); |
| 260 network_time::NetworkTimeTracker::RegisterPrefs(registry); | 261 network_time::NetworkTimeTracker::RegisterPrefs(registry); |
| 261 PrefProxyConfigTrackerImpl::RegisterPrefs(registry); | 262 PrefProxyConfigTrackerImpl::RegisterPrefs(registry); |
| 262 ProfileInfoCache::RegisterPrefs(registry); | 263 ProfileInfoCache::RegisterPrefs(registry); |
| 263 profiles::RegisterPrefs(registry); | 264 profiles::RegisterPrefs(registry); |
| 264 PromoResourceService::RegisterPrefs(registry); | 265 PromoResourceService::RegisterPrefs(registry); |
| 265 rappor::RapporService::RegisterPrefs(registry); | 266 rappor::RapporService::RegisterPrefs(registry); |
| 266 RegisterScreenshotPrefs(registry); | 267 RegisterScreenshotPrefs(registry); |
| 267 SigninManagerFactory::RegisterPrefs(registry); | 268 SigninManagerFactory::RegisterPrefs(registry); |
| 268 SSLConfigServiceManager::RegisterPrefs(registry); | 269 SSLConfigServiceManager::RegisterPrefs(registry); |
| 270 StartupBrowserCreator::RegisterLocalStatePrefs(registry); |
| 269 UpgradeDetector::RegisterPrefs(registry); | 271 UpgradeDetector::RegisterPrefs(registry); |
| 270 | 272 |
| 271 #if defined(ENABLE_AUTOFILL_DIALOG) | 273 #if defined(ENABLE_AUTOFILL_DIALOG) |
| 272 autofill::AutofillDialogController::RegisterPrefs(registry); | 274 autofill::AutofillDialogController::RegisterPrefs(registry); |
| 273 #endif | 275 #endif |
| 274 | 276 |
| 275 #if defined(ENABLE_CONFIGURATION_POLICY) | 277 #if defined(ENABLE_CONFIGURATION_POLICY) |
| 276 policy::BrowserPolicyConnector::RegisterPrefs(registry); | 278 policy::BrowserPolicyConnector::RegisterPrefs(registry); |
| 277 policy::PolicyStatisticsCollector::RegisterPrefs(registry); | 279 policy::PolicyStatisticsCollector::RegisterPrefs(registry); |
| 278 #endif | 280 #endif |
| (...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 630 host_zoom_dictionary, false /* sanitize_partition_host_zoom_levels */); | 632 host_zoom_dictionary, false /* sanitize_partition_host_zoom_levels */); |
| 631 | 633 |
| 632 // We're done migrating the profile per-host zoom level values, so we clear | 634 // We're done migrating the profile per-host zoom level values, so we clear |
| 633 // them all. | 635 // them all. |
| 634 DictionaryPrefUpdate host_zoom_dictionary_update( | 636 DictionaryPrefUpdate host_zoom_dictionary_update( |
| 635 prefs, prefs::kPerHostZoomLevelsDeprecated); | 637 prefs, prefs::kPerHostZoomLevelsDeprecated); |
| 636 host_zoom_dictionary_update->Clear(); | 638 host_zoom_dictionary_update->Clear(); |
| 637 } | 639 } |
| 638 | 640 |
| 639 } // namespace chrome | 641 } // namespace chrome |
| OLD | NEW |