chrome/browser/prefs/browser_prefs.cc - Issue 13991017: Commit InvalidationService implementations

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 13991017: Commit InvalidationService implementations (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Minor updates Created 7 years, 8 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:

Index: chrome/browser/prefs/browser_prefs.cc

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

index cdf88cadb174ac8a8200a235873e1b51f5cf6f27..0553d4f5c8d753b97933a9437c22757115987f76 100644

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

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

@@ -34,6 +34,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/managed_mode/managed_mode.h"

#include "chrome/browser/managed_mode/managed_user_service.h"

@@ -65,7 +66,6 @@

#include "chrome/browser/search/search.h"

#include "chrome/browser/search_engines/template_url_prepopulate_data.h"

#include "chrome/browser/signin/signin_manager_factory.h"

-#include "chrome/browser/sync/invalidations/invalidator_storage.h"

#include "chrome/browser/sync/sync_prefs.h"

#include "chrome/browser/task_manager/task_manager.h"

#include "chrome/browser/translate/translate_prefs.h"

@@ -288,7 +288,7 @@ void RegisterUserPrefs(PrefRegistrySyncable* registry) {

HostContentSettingsMap::RegisterUserPrefs(registry);

IncognitoModePrefs::RegisterUserPrefs(registry);

InstantUI::RegisterUserPrefs(registry);

- browser_sync::InvalidatorStorage::RegisterUserPrefs(registry);

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

MediaCaptureDevicesDispatcher::RegisterUserPrefs(registry);

MediaStreamDevicesController::RegisterUserPrefs(registry);

NetPrefObserver::RegisterUserPrefs(registry);