chrome/browser/prefs/browser_prefs.cc - Issue 1412863004: arc-bridge: Add the ARC Bridge Service

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 1412863004: arc-bridge: Add the ARC Bridge Service (Closed) Base URL: https://chromium.googlesource.com/a/chromium/src.git@master

Patch Set: Addressed feedback and fixed failing tests Created 5 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:

Index: chrome/browser/prefs/browser_prefs.cc

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

index 32950be71848f27bb52501f4c7c53be507eeec47..838e6d770b54437afd6c4097493ea0da6f151db2 100644

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

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

@@ -193,6 +193,7 @@

#include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"

#include "chromeos/audio/audio_devices_pref_handler_impl.h"

#include "chromeos/timezone/timezone_resolver.h"

+#include "components/arc/arc_prefs.h"

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

#else

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

@@ -491,6 +492,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {

extensions::EnterprisePlatformKeysPrivateChallengeUserKeyFunction::

RegisterProfilePrefs(registry);

FlagsUI::RegisterProfilePrefs(registry);

+ arc::ArcPrefs::RegisterProfilePrefs(registry);

#endif

#if defined(OS_WIN)