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

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

Issue 2445153002: Move onc and proxy pref names to components. (Closed)
Patch Set: Rebase Created 4 years, 1 month 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/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/metrics/histogram_macros.h" 10 #include "base/metrics/histogram_macros.h"
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 #include "chrome/browser/media/protected_media_identifier_permission_context.h" 205 #include "chrome/browser/media/protected_media_identifier_permission_context.h"
206 #include "chrome/browser/metrics/chromeos_metrics_provider.h" 206 #include "chrome/browser/metrics/chromeos_metrics_provider.h"
207 #include "chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h" 207 #include "chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h"
208 #include "chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler .h" 208 #include "chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler .h"
209 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h" 209 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h"
210 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h" 210 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h"
211 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" 211 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
212 #include "chromeos/audio/audio_devices_pref_handler_impl.h" 212 #include "chromeos/audio/audio_devices_pref_handler_impl.h"
213 #include "chromeos/timezone/timezone_resolver.h" 213 #include "chromeos/timezone/timezone_resolver.h"
214 #include "components/invalidation/impl/invalidator_storage.h" 214 #include "components/invalidation/impl/invalidator_storage.h"
215 #include "components/onc/onc_pref_names.h"
215 #include "components/quirks/quirks_manager.h" 216 #include "components/quirks/quirks_manager.h"
216 #else 217 #else
217 #include "chrome/browser/extensions/default_apps.h" 218 #include "chrome/browser/extensions/default_apps.h"
218 #endif 219 #endif
219 220
220 #if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_APP_LIST) 221 #if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_APP_LIST)
221 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h" 222 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
222 #endif 223 #endif
223 224
224 #if defined(OS_MACOSX) 225 #if defined(OS_MACOSX)
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 chromeos::DataPromoNotification::RegisterPrefs(registry); 412 chromeos::DataPromoNotification::RegisterPrefs(registry);
412 chromeos::DeviceOAuth2TokenService::RegisterPrefs(registry); 413 chromeos::DeviceOAuth2TokenService::RegisterPrefs(registry);
413 chromeos::device_settings_cache::RegisterPrefs(registry); 414 chromeos::device_settings_cache::RegisterPrefs(registry);
414 chromeos::EnableDebuggingScreenHandler::RegisterPrefs(registry); 415 chromeos::EnableDebuggingScreenHandler::RegisterPrefs(registry);
415 chromeos::language_prefs::RegisterPrefs(registry); 416 chromeos::language_prefs::RegisterPrefs(registry);
416 chromeos::KioskAppManager::RegisterPrefs(registry); 417 chromeos::KioskAppManager::RegisterPrefs(registry);
417 chromeos::MultiProfileUserController::RegisterPrefs(registry); 418 chromeos::MultiProfileUserController::RegisterPrefs(registry);
418 chromeos::HIDDetectionScreenHandler::RegisterPrefs(registry); 419 chromeos::HIDDetectionScreenHandler::RegisterPrefs(registry);
419 chromeos::DemoModeDetector::RegisterPrefs(registry); 420 chromeos::DemoModeDetector::RegisterPrefs(registry);
420 chromeos::Preferences::RegisterPrefs(registry); 421 chromeos::Preferences::RegisterPrefs(registry);
421 chromeos::proxy_config::RegisterPrefs(registry);
422 chromeos::RegisterDisplayLocalStatePrefs(registry); 422 chromeos::RegisterDisplayLocalStatePrefs(registry);
423 chromeos::ResetScreenHandler::RegisterPrefs(registry); 423 chromeos::ResetScreenHandler::RegisterPrefs(registry);
424 chromeos::ResourceReporter::RegisterPrefs(registry); 424 chromeos::ResourceReporter::RegisterPrefs(registry);
425 chromeos::ServicesCustomizationDocument::RegisterPrefs(registry); 425 chromeos::ServicesCustomizationDocument::RegisterPrefs(registry);
426 chromeos::SigninScreenHandler::RegisterPrefs(registry); 426 chromeos::SigninScreenHandler::RegisterPrefs(registry);
427 chromeos::StartupUtils::RegisterPrefs(registry); 427 chromeos::StartupUtils::RegisterPrefs(registry);
428 chromeos::system::AutomaticRebootManager::RegisterPrefs(registry); 428 chromeos::system::AutomaticRebootManager::RegisterPrefs(registry);
429 chromeos::system::InputDeviceSettings::RegisterPrefs(registry); 429 chromeos::system::InputDeviceSettings::RegisterPrefs(registry);
430 chromeos::TimeZoneResolver::RegisterPrefs(registry); 430 chromeos::TimeZoneResolver::RegisterPrefs(registry);
431 chromeos::UserImageManager::RegisterPrefs(registry); 431 chromeos::UserImageManager::RegisterPrefs(registry);
432 chromeos::UserSessionManager::RegisterPrefs(registry); 432 chromeos::UserSessionManager::RegisterPrefs(registry);
433 chromeos::WallpaperManager::RegisterPrefs(registry); 433 chromeos::WallpaperManager::RegisterPrefs(registry);
434 chromeos::echo_offer::RegisterPrefs(registry); 434 chromeos::echo_offer::RegisterPrefs(registry);
435 extensions::ExtensionAssetsManagerChromeOS::RegisterPrefs(registry); 435 extensions::ExtensionAssetsManagerChromeOS::RegisterPrefs(registry);
436 invalidation::InvalidatorStorage::RegisterPrefs(registry); 436 invalidation::InvalidatorStorage::RegisterPrefs(registry);
437 ::onc::RegisterPrefs(registry);
437 policy::AutoEnrollmentClient::RegisterPrefs(registry); 438 policy::AutoEnrollmentClient::RegisterPrefs(registry);
438 policy::BrowserPolicyConnectorChromeOS::RegisterPrefs(registry); 439 policy::BrowserPolicyConnectorChromeOS::RegisterPrefs(registry);
439 policy::DeviceCloudPolicyManagerChromeOS::RegisterPrefs(registry); 440 policy::DeviceCloudPolicyManagerChromeOS::RegisterPrefs(registry);
440 policy::DeviceStatusCollector::RegisterPrefs(registry); 441 policy::DeviceStatusCollector::RegisterPrefs(registry);
441 policy::PolicyCertServiceFactory::RegisterPrefs(registry); 442 policy::PolicyCertServiceFactory::RegisterPrefs(registry);
442 quirks::QuirksManager::RegisterPrefs(registry); 443 quirks::QuirksManager::RegisterPrefs(registry);
443 #endif 444 #endif
444 445
445 #if defined(OS_MACOSX) 446 #if defined(OS_MACOSX)
446 confirm_quit::RegisterLocalState(registry); 447 confirm_quit::RegisterLocalState(registry);
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
592 593
593 #if defined(OS_CHROMEOS) 594 #if defined(OS_CHROMEOS)
594 arc::ArcAuthService::RegisterProfilePrefs(registry); 595 arc::ArcAuthService::RegisterProfilePrefs(registry);
595 chromeos::first_run::RegisterProfilePrefs(registry); 596 chromeos::first_run::RegisterProfilePrefs(registry);
596 chromeos::file_system_provider::RegisterProfilePrefs(registry); 597 chromeos::file_system_provider::RegisterProfilePrefs(registry);
597 chromeos::KeyPermissions::RegisterProfilePrefs(registry); 598 chromeos::KeyPermissions::RegisterProfilePrefs(registry);
598 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry); 599 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry);
599 chromeos::PinStorage::RegisterProfilePrefs(registry); 600 chromeos::PinStorage::RegisterProfilePrefs(registry);
600 chromeos::Preferences::RegisterProfilePrefs(registry); 601 chromeos::Preferences::RegisterProfilePrefs(registry);
601 chromeos::PrinterPrefManager::RegisterProfilePrefs(registry); 602 chromeos::PrinterPrefManager::RegisterProfilePrefs(registry);
602 chromeos::proxy_config::RegisterProfilePrefs(registry);
603 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry); 603 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry);
604 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry); 604 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry);
605 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry); 605 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry);
606 extensions::EPKPChallengeUserKey::RegisterProfilePrefs(registry); 606 extensions::EPKPChallengeUserKey::RegisterProfilePrefs(registry);
607 flags_ui::PrefServiceFlagsStorage::RegisterProfilePrefs(registry); 607 flags_ui::PrefServiceFlagsStorage::RegisterProfilePrefs(registry);
608 ::onc::RegisterProfilePrefs(registry);
608 #endif 609 #endif
609 610
610 #if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_APP_LIST) 611 #if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_APP_LIST)
611 ArcAppListPrefs::RegisterProfilePrefs(registry); 612 ArcAppListPrefs::RegisterProfilePrefs(registry);
612 #endif 613 #endif
613 614
614 #if defined(OS_WIN) 615 #if defined(OS_WIN)
615 component_updater::RegisterProfilePrefsForSwReporter(registry); 616 component_updater::RegisterProfilePrefsForSwReporter(registry);
616 NetworkProfileBubble::RegisterProfilePrefs(registry); 617 NetworkProfileBubble::RegisterProfilePrefs(registry);
617 #endif 618 #endif
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
774 // Added 8/2016. 775 // Added 8/2016.
775 profile_prefs->ClearPref(kStaticEncodings); 776 profile_prefs->ClearPref(kStaticEncodings);
776 profile_prefs->ClearPref(kRecentlySelectedEncoding); 777 profile_prefs->ClearPref(kRecentlySelectedEncoding);
777 778
778 // Added 9/2016. 779 // Added 9/2016.
779 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); 780 profile_prefs->ClearPref(kWebKitUsesUniversalDetector);
780 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); 781 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent);
781 } 782 }
782 783
783 } // namespace chrome 784 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698