chrome/browser/prefs/browser_prefs.cc - Issue 1528963002: Quirks Client for downloading and providing display profiles

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 1528963002: Quirks Client for downloading and providing display profiles (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fourth round of review fixes Created 4 years, 10 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

« ash/display/display_color_manager_chromeos.cc ('K') | « chrome/browser/chromeos/display/quirks_client_delegate_impl.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | components/quirks_client/DEPS » ('J')
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 f258ac30ef1edefdf1534a274d9af96e05204dbe..9f278dec7309581c1cb527d2fbd3811a4dea95b4 100644

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

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

@@ -197,6 +197,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/quirks_client/quirks_client_manager.h"

#else

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

#endif

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

chromeos::StartupUtils::RegisterPrefs(registry);

chromeos::system::AutomaticRebootManager::RegisterPrefs(registry);

chromeos::system::InputDeviceSettings::RegisterPrefs(registry);

+ chromeos::TimeZoneResolver::RegisterPrefs(registry);

chromeos::UserImageManager::RegisterPrefs(registry);

chromeos::UserSessionManager::RegisterPrefs(registry);

chromeos::WallpaperManager::RegisterPrefs(registry);

@@ -381,7 +383,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {

policy::DeviceCloudPolicyManagerChromeOS::RegisterPrefs(registry);

policy::DeviceStatusCollector::RegisterPrefs(registry);

policy::PolicyCertServiceFactory::RegisterPrefs(registry);

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

+ quirks_client::QuirksClientManager::RegisterPrefs(registry);

#endif

#if defined(OS_MACOSX)