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

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

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

Powered by Google App Engine
This is Rietveld 408576698