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