chrome/browser/prefs/browser_prefs.cc - Issue 17911005: Merge 208347 "Revert 208315 "Make use of InvalidationService""

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 17911005: Merge 208347 "Revert 208315 "Make use of InvalidationService"" (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1547/src/

Patch Set: Created 7 years, 6 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/invalidation/ticl_invalidation_service_unittest.cc ('k') | chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/prefs/browser_prefs.cc

===================================================================

--- chrome/browser/prefs/browser_prefs.cc (revision 208727)

+++ chrome/browser/prefs/browser_prefs.cc (working copy)

@@ -33,6 +33,7 @@

#include "chrome/browser/gpu/gl_string_manager.h"

#include "chrome/browser/gpu/gpu_mode_manager.h"

#include "chrome/browser/intranet_redirect_detector.h"

+#include "chrome/browser/invalidation/invalidator_storage.h"

#include "chrome/browser/io_thread.h"

#include "chrome/browser/media/media_capture_devices_dispatcher.h"

#include "chrome/browser/media/media_stream_devices_controller.h"

@@ -302,6 +303,7 @@

HostContentSettingsMap::RegisterUserPrefs(registry);

IncognitoModePrefs::RegisterUserPrefs(registry);

InstantUI::RegisterUserPrefs(registry);

+ invalidation::InvalidatorStorage::RegisterUserPrefs(registry);

MediaCaptureDevicesDispatcher::RegisterUserPrefs(registry);

MediaStreamDevicesController::RegisterUserPrefs(registry);

NetPrefObserver::RegisterUserPrefs(registry);