chrome/browser/prefs/browser_prefs.cc - Issue 2445153002: Move onc and proxy pref names to components.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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, 2 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/proxy_cros_settings_parser.cc ('k') | chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/prefs/browser_prefs.cc

diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc

index 715d5ec631be55ec8232c00534fc39d7ce06c727..274044408ffc202269be12dd2a4396b412851933 100644

--- a/chrome/browser/prefs/browser_prefs.cc

+++ b/chrome/browser/prefs/browser_prefs.cc

@@ -213,6 +213,7 @@

#include "chromeos/audio/audio_devices_pref_handler_impl.h"

#include "chromeos/timezone/timezone_resolver.h"

#include "components/invalidation/impl/invalidator_storage.h"

+#include "components/onc/onc_pref_names.h"

#include "components/quirks/quirks_manager.h"

#else

#include "chrome/browser/extensions/default_apps.h"

@@ -419,7 +420,6 @@ void RegisterLocalState(PrefRegistrySimple* registry) {

chromeos::HIDDetectionScreenHandler::RegisterPrefs(registry);

chromeos::DemoModeDetector::RegisterPrefs(registry);

chromeos::Preferences::RegisterPrefs(registry);

- chromeos::proxy_config::RegisterPrefs(registry);

chromeos::RegisterDisplayLocalStatePrefs(registry);

chromeos::ResetScreenHandler::RegisterPrefs(registry);

chromeos::ResourceReporter::RegisterPrefs(registry);

@@ -435,6 +435,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {

chromeos::echo_offer::RegisterPrefs(registry);

extensions::ExtensionAssetsManagerChromeOS::RegisterPrefs(registry);

invalidation::InvalidatorStorage::RegisterPrefs(registry);

+ ::onc::RegisterPrefs(registry);

policy::AutoEnrollmentClient::RegisterPrefs(registry);

policy::BrowserPolicyConnectorChromeOS::RegisterPrefs(registry);

policy::DeviceCloudPolicyManagerChromeOS::RegisterPrefs(registry);

@@ -601,12 +602,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {

chromeos::PinStorage::RegisterProfilePrefs(registry);

chromeos::Preferences::RegisterProfilePrefs(registry);

chromeos::PrinterPrefManager::RegisterProfilePrefs(registry);

- chromeos::proxy_config::RegisterProfilePrefs(registry);

chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry);

chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry);

chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry);

extensions::EPKPChallengeUserKey::RegisterProfilePrefs(registry);

flags_ui::PrefServiceFlagsStorage::RegisterProfilePrefs(registry);

+ ::onc::RegisterProfilePrefs(registry);

#endif

#if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_APP_LIST)