| 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 306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 317 RegisterBrowserPrefs(registry); | 317 RegisterBrowserPrefs(registry); |
| 318 // The native GCM is used on Android instead. | 318 // The native GCM is used on Android instead. |
| 319 gcm::GCMChannelStatusSyncer::RegisterPrefs(registry); | 319 gcm::GCMChannelStatusSyncer::RegisterPrefs(registry); |
| 320 #if !defined(OS_CHROMEOS) | 320 #if !defined(OS_CHROMEOS) |
| 321 RegisterDefaultBrowserPromptPrefs(registry); | 321 RegisterDefaultBrowserPromptPrefs(registry); |
| 322 #endif // !defined(OS_CHROMEOS) | 322 #endif // !defined(OS_CHROMEOS) |
| 323 #endif // !defined(OS_ANDROID) | 323 #endif // !defined(OS_ANDROID) |
| 324 | 324 |
| 325 #if defined(OS_CHROMEOS) | 325 #if defined(OS_CHROMEOS) |
| 326 ChromeOSMetricsProvider::RegisterPrefs(registry); | 326 ChromeOSMetricsProvider::RegisterPrefs(registry); |
| 327 chromeos::AudioDevicesPrefHandlerImpl::RegisterPrefs( | 327 chromeos::AudioDevicesPrefHandlerImpl::RegisterPrefs(registry); |
| 328 registry, prefs::kAudioCaptureAllowed); | |
| 329 chromeos::ChromeUserManagerImpl::RegisterPrefs(registry); | 328 chromeos::ChromeUserManagerImpl::RegisterPrefs(registry); |
| 330 chromeos::DataPromoNotification::RegisterPrefs(registry); | 329 chromeos::DataPromoNotification::RegisterPrefs(registry); |
| 331 chromeos::DeviceOAuth2TokenService::RegisterPrefs(registry); | 330 chromeos::DeviceOAuth2TokenService::RegisterPrefs(registry); |
| 332 chromeos::device_settings_cache::RegisterPrefs(registry); | 331 chromeos::device_settings_cache::RegisterPrefs(registry); |
| 333 chromeos::default_pinned_apps_field_trial::RegisterPrefs(registry); | 332 chromeos::default_pinned_apps_field_trial::RegisterPrefs(registry); |
| 334 chromeos::EnableDebuggingScreenHandler::RegisterPrefs(registry); | 333 chromeos::EnableDebuggingScreenHandler::RegisterPrefs(registry); |
| 335 chromeos::language_prefs::RegisterPrefs(registry); | 334 chromeos::language_prefs::RegisterPrefs(registry); |
| 336 chromeos::KioskAppManager::RegisterPrefs(registry); | 335 chromeos::KioskAppManager::RegisterPrefs(registry); |
| 337 chromeos::MultiProfileUserController::RegisterPrefs(registry); | 336 chromeos::MultiProfileUserController::RegisterPrefs(registry); |
| 338 chromeos::HIDDetectionScreenHandler::RegisterPrefs(registry); | 337 chromeos::HIDDetectionScreenHandler::RegisterPrefs(registry); |
| (...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 707 host_zoom_dictionary, false /* sanitize_partition_host_zoom_levels */); | 706 host_zoom_dictionary, false /* sanitize_partition_host_zoom_levels */); |
| 708 | 707 |
| 709 // We're done migrating the profile per-host zoom level values, so we clear | 708 // We're done migrating the profile per-host zoom level values, so we clear |
| 710 // them all. | 709 // them all. |
| 711 DictionaryPrefUpdate host_zoom_dictionary_update( | 710 DictionaryPrefUpdate host_zoom_dictionary_update( |
| 712 prefs, prefs::kPerHostZoomLevelsDeprecated); | 711 prefs, prefs::kPerHostZoomLevelsDeprecated); |
| 713 host_zoom_dictionary_update->Clear(); | 712 host_zoom_dictionary_update->Clear(); |
| 714 } | 713 } |
| 715 | 714 |
| 716 } // namespace chrome | 715 } // namespace chrome |
| OLD | NEW |