| 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/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 #include "chrome/browser/search/search.h" | 59 #include "chrome/browser/search/search.h" |
| 60 #include "chrome/browser/services/gcm/gcm_profile_service.h" | 60 #include "chrome/browser/services/gcm/gcm_profile_service.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/ui/app_list/app_list_prefs.h" | 63 #include "chrome/browser/ui/app_list/app_list_prefs.h" |
| 64 #include "chrome/browser/ui/app_list/app_list_service.h" | 64 #include "chrome/browser/ui/app_list/app_list_service.h" |
| 65 #include "chrome/browser/ui/browser_ui_prefs.h" | 65 #include "chrome/browser/ui/browser_ui_prefs.h" |
| 66 #include "chrome/browser/ui/navigation_correction_tab_observer.h" | 66 #include "chrome/browser/ui/navigation_correction_tab_observer.h" |
| 67 #include "chrome/browser/ui/network_profile_bubble.h" | 67 #include "chrome/browser/ui/network_profile_bubble.h" |
| 68 #include "chrome/browser/ui/passwords/password_bubble_experiment.h" | 68 #include "chrome/browser/ui/passwords/password_bubble_experiment.h" |
| 69 #include "chrome/browser/ui/passwords/password_manager_url_collection_experiment
.h" |
| 69 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" | 70 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" |
| 70 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" | 71 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" |
| 71 #include "chrome/browser/ui/startup/autolaunch_prompt.h" | 72 #include "chrome/browser/ui/startup/autolaunch_prompt.h" |
| 72 #include "chrome/browser/ui/startup/default_browser_prompt.h" | 73 #include "chrome/browser/ui/startup/default_browser_prompt.h" |
| 73 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" | 74 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" |
| 74 #include "chrome/browser/ui/webui/flags_ui.h" | 75 #include "chrome/browser/ui/webui/flags_ui.h" |
| 75 #include "chrome/browser/ui/webui/instant_ui.h" | 76 #include "chrome/browser/ui/webui/instant_ui.h" |
| 76 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" | 77 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" |
| 77 #include "chrome/browser/ui/webui/plugins_ui.h" | 78 #include "chrome/browser/ui/webui/plugins_ui.h" |
| 78 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" | 79 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" |
| (...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 401 gcm::GCMProfileService::RegisterProfilePrefs(registry); | 402 gcm::GCMProfileService::RegisterProfilePrefs(registry); |
| 402 HostContentSettingsMap::RegisterProfilePrefs(registry); | 403 HostContentSettingsMap::RegisterProfilePrefs(registry); |
| 403 IncognitoModePrefs::RegisterProfilePrefs(registry); | 404 IncognitoModePrefs::RegisterProfilePrefs(registry); |
| 404 InstantUI::RegisterProfilePrefs(registry); | 405 InstantUI::RegisterProfilePrefs(registry); |
| 405 NavigationCorrectionTabObserver::RegisterProfilePrefs(registry); | 406 NavigationCorrectionTabObserver::RegisterProfilePrefs(registry); |
| 406 MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry); | 407 MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry); |
| 407 MediaDeviceIDSalt::RegisterProfilePrefs(registry); | 408 MediaDeviceIDSalt::RegisterProfilePrefs(registry); |
| 408 MediaStreamDevicesController::RegisterProfilePrefs(registry); | 409 MediaStreamDevicesController::RegisterProfilePrefs(registry); |
| 409 NetPrefObserver::RegisterProfilePrefs(registry); | 410 NetPrefObserver::RegisterProfilePrefs(registry); |
| 410 password_manager::PasswordManager::RegisterProfilePrefs(registry); | 411 password_manager::PasswordManager::RegisterProfilePrefs(registry); |
| 412 password_manager::urls_collection_experiment::RegisterPrefs(registry); |
| 411 password_bubble_experiment::RegisterPrefs(registry); | 413 password_bubble_experiment::RegisterPrefs(registry); |
| 412 PrefProxyConfigTrackerImpl::RegisterProfilePrefs(registry); | 414 PrefProxyConfigTrackerImpl::RegisterProfilePrefs(registry); |
| 413 PrefsTabHelper::RegisterProfilePrefs(registry); | 415 PrefsTabHelper::RegisterProfilePrefs(registry); |
| 414 Profile::RegisterProfilePrefs(registry); | 416 Profile::RegisterProfilePrefs(registry); |
| 415 ProfileImpl::RegisterProfilePrefs(registry); | 417 ProfileImpl::RegisterProfilePrefs(registry); |
| 416 PromoResourceService::RegisterProfilePrefs(registry); | 418 PromoResourceService::RegisterProfilePrefs(registry); |
| 417 ProtocolHandlerRegistry::RegisterProfilePrefs(registry); | 419 ProtocolHandlerRegistry::RegisterProfilePrefs(registry); |
| 418 RegisterBrowserUserPrefs(registry); | 420 RegisterBrowserUserPrefs(registry); |
| 419 SessionStartupPref::RegisterProfilePrefs(registry); | 421 SessionStartupPref::RegisterProfilePrefs(registry); |
| 420 TemplateURLPrepopulateData::RegisterProfilePrefs(registry); | 422 TemplateURLPrepopulateData::RegisterProfilePrefs(registry); |
| (...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 703 host_zoom_dictionary, false /* sanitize_partition_host_zoom_levels */); | 705 host_zoom_dictionary, false /* sanitize_partition_host_zoom_levels */); |
| 704 | 706 |
| 705 // We're done migrating the profile per-host zoom level values, so we clear | 707 // We're done migrating the profile per-host zoom level values, so we clear |
| 706 // them all. | 708 // them all. |
| 707 DictionaryPrefUpdate host_zoom_dictionary_update( | 709 DictionaryPrefUpdate host_zoom_dictionary_update( |
| 708 prefs, prefs::kPerHostZoomLevelsDeprecated); | 710 prefs, prefs::kPerHostZoomLevelsDeprecated); |
| 709 host_zoom_dictionary_update->Clear(); | 711 host_zoom_dictionary_update->Clear(); |
| 710 } | 712 } |
| 711 | 713 |
| 712 } // namespace chrome | 714 } // namespace chrome |
| OLD | NEW |