Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(49)

Side by Side Diff: chrome/browser/prefs/browser_prefs.cc

Issue 1001723002: media: Refactor PlatformVerificationFlow. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments addressed Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 #include "chrome/browser/profile_resetter/automatic_profile_resetter_factory.h" 149 #include "chrome/browser/profile_resetter/automatic_profile_resetter_factory.h"
150 #include "chrome/browser/ui/autofill/generated_credit_card_bubble_controller.h" 150 #include "chrome/browser/ui/autofill/generated_credit_card_bubble_controller.h"
151 #endif 151 #endif
152 152
153 #if !defined(OS_ANDROID) && !defined(OS_IOS) 153 #if !defined(OS_ANDROID) && !defined(OS_IOS)
154 #include "chrome/browser/signin/signin_promo.h" 154 #include "chrome/browser/signin/signin_promo.h"
155 #endif 155 #endif
156 156
157 #if defined(OS_CHROMEOS) 157 #if defined(OS_CHROMEOS)
158 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" 158 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
159 #include "chrome/browser/chromeos/attestation/platform_verification_flow.h"
160 #include "chrome/browser/chromeos/customization/customization_document.h" 159 #include "chrome/browser/chromeos/customization/customization_document.h"
161 #include "chrome/browser/chromeos/display/display_preferences.h" 160 #include "chrome/browser/chromeos/display/display_preferences.h"
162 #include "chrome/browser/chromeos/extensions/echo_private_api.h" 161 #include "chrome/browser/chromeos/extensions/echo_private_api.h"
163 #include "chrome/browser/chromeos/file_system_provider/registry.h" 162 #include "chrome/browser/chromeos/file_system_provider/registry.h"
164 #include "chrome/browser/chromeos/first_run/first_run.h" 163 #include "chrome/browser/chromeos/first_run/first_run.h"
165 #include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h" 164 #include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h"
166 #include "chrome/browser/chromeos/login/session/user_session_manager.h" 165 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
167 #include "chrome/browser/chromeos/login/startup_utils.h" 166 #include "chrome/browser/chromeos/login/startup_utils.h"
168 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h" 167 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h"
169 #include "chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h" 168 #include "chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h"
170 #include "chrome/browser/chromeos/login/users/chrome_user_manager_impl.h" 169 #include "chrome/browser/chromeos/login/users/chrome_user_manager_impl.h"
171 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h" 170 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h"
172 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" 171 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
173 #include "chrome/browser/chromeos/net/proxy_config_handler.h" 172 #include "chrome/browser/chromeos/net/proxy_config_handler.h"
174 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h" 173 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h"
175 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 174 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
176 #include "chrome/browser/chromeos/policy/consumer_management_service.h" 175 #include "chrome/browser/chromeos/policy/consumer_management_service.h"
177 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" 176 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
178 #include "chrome/browser/chromeos/policy/device_status_collector.h" 177 #include "chrome/browser/chromeos/policy/device_status_collector.h"
179 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h" 178 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h"
180 #include "chrome/browser/chromeos/power/power_prefs.h" 179 #include "chrome/browser/chromeos/power/power_prefs.h"
181 #include "chrome/browser/chromeos/preferences.h" 180 #include "chrome/browser/chromeos/preferences.h"
182 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h" 181 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h"
183 #include "chrome/browser/chromeos/settings/device_settings_cache.h" 182 #include "chrome/browser/chromeos/settings/device_settings_cache.h"
184 #include "chrome/browser/chromeos/status/data_promo_notification.h" 183 #include "chrome/browser/chromeos/status/data_promo_notification.h"
185 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h" 184 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h"
186 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr ise_platform_keys_private_api.h" 185 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr ise_platform_keys_private_api.h"
187 #include "chrome/browser/extensions/extension_assets_manager_chromeos.h" 186 #include "chrome/browser/extensions/extension_assets_manager_chromeos.h"
187 #include "chrome/browser/media/protected_media_identifier_permission_context.h"
188 #include "chrome/browser/metrics/chromeos_metrics_provider.h" 188 #include "chrome/browser/metrics/chromeos_metrics_provider.h"
189 #include "chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h" 189 #include "chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h"
190 #include "chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler .h" 190 #include "chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler .h"
191 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h" 191 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h"
192 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h" 192 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h"
193 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" 193 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
194 #include "chromeos/audio/audio_devices_pref_handler_impl.h" 194 #include "chromeos/audio/audio_devices_pref_handler_impl.h"
195 #include "chromeos/timezone/timezone_resolver.h" 195 #include "chromeos/timezone/timezone_resolver.h"
196 #include "components/invalidation/invalidator_storage.h" 196 #include "components/invalidation/invalidator_storage.h"
197 #else 197 #else
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
476 PluginsUI::RegisterProfilePrefs(registry); 476 PluginsUI::RegisterProfilePrefs(registry);
477 RegisterAutolaunchUserPrefs(registry); 477 RegisterAutolaunchUserPrefs(registry);
478 signin::RegisterProfilePrefs(registry); 478 signin::RegisterProfilePrefs(registry);
479 #endif 479 #endif
480 480
481 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) 481 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
482 default_apps::RegisterProfilePrefs(registry); 482 default_apps::RegisterProfilePrefs(registry);
483 #endif 483 #endif
484 484
485 #if defined(OS_CHROMEOS) 485 #if defined(OS_CHROMEOS)
486 chromeos::attestation::PlatformVerificationFlow::RegisterProfilePrefs(
487 registry);
488 chromeos::first_run::RegisterProfilePrefs(registry); 486 chromeos::first_run::RegisterProfilePrefs(registry);
489 chromeos::file_system_provider::RegisterProfilePrefs(registry); 487 chromeos::file_system_provider::RegisterProfilePrefs(registry);
490 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry); 488 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry);
491 chromeos::Preferences::RegisterProfilePrefs(registry); 489 chromeos::Preferences::RegisterProfilePrefs(registry);
492 chromeos::proxy_config::RegisterProfilePrefs(registry); 490 chromeos::proxy_config::RegisterProfilePrefs(registry);
493 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry); 491 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry);
494 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry); 492 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry);
495 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry); 493 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry);
496 extensions::EnterprisePlatformKeysPrivateChallengeUserKeyFunction:: 494 extensions::EnterprisePlatformKeysPrivateChallengeUserKeyFunction::
497 RegisterProfilePrefs(registry); 495 RegisterProfilePrefs(registry);
498 FlagsUI::RegisterProfilePrefs(registry); 496 FlagsUI::RegisterProfilePrefs(registry);
497 ProtectedMediaIdentifierPermissionContext::RegisterProfilePrefs(registry);
499 #endif 498 #endif
500 499
501 #if defined(OS_WIN) 500 #if defined(OS_WIN)
502 component_updater::RegisterProfilePrefsForSwReporter(registry); 501 component_updater::RegisterProfilePrefsForSwReporter(registry);
503 NetworkProfileBubble::RegisterProfilePrefs(registry); 502 NetworkProfileBubble::RegisterProfilePrefs(registry);
504 #endif 503 #endif
505 504
506 #if defined(TOOLKIT_VIEWS) 505 #if defined(TOOLKIT_VIEWS)
507 RegisterBrowserViewProfilePrefs(registry); 506 RegisterBrowserViewProfilePrefs(registry);
508 RegisterInvertBubbleUserPrefs(registry); 507 RegisterInvertBubbleUserPrefs(registry);
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
621 host_zoom_dictionary, false /* sanitize_partition_host_zoom_levels */); 620 host_zoom_dictionary, false /* sanitize_partition_host_zoom_levels */);
622 621
623 // We're done migrating the profile per-host zoom level values, so we clear 622 // We're done migrating the profile per-host zoom level values, so we clear
624 // them all. 623 // them all.
625 DictionaryPrefUpdate host_zoom_dictionary_update( 624 DictionaryPrefUpdate host_zoom_dictionary_update(
626 prefs, prefs::kPerHostZoomLevelsDeprecated); 625 prefs, prefs::kPerHostZoomLevelsDeprecated);
627 host_zoom_dictionary_update->Clear(); 626 host_zoom_dictionary_update->Clear();
628 } 627 }
629 628
630 } // namespace chrome 629 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698