components/browser_sync/browser/profile_sync_service.cc - Issue 1662843002: Revert of Delete base/prefs and update callers to use 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: components/browser_sync/browser/profile_sync_service.cc

Issue 1662843002: Revert of Delete base/prefs and update callers to use components. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 11 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

Index: components/browser_sync/browser/profile_sync_service.cc

diff --git a/components/browser_sync/browser/profile_sync_service.cc b/components/browser_sync/browser/profile_sync_service.cc

index 34bf3043032688871ed9ab204893bd3fd1e9c2a1..771208f620f62709f5086620dc01f66d64308469 100644

--- a/components/browser_sync/browser/profile_sync_service.cc

+++ b/components/browser_sync/browser/profile_sync_service.cc

@@ -20,6 +20,7 @@

#include "base/macros.h"

#include "base/memory/ref_counted.h"

#include "base/metrics/histogram.h"

+#include "base/prefs/json_pref_store.h"

#include "base/profiler/scoped_tracker.h"

#include "base/single_thread_task_runner.h"

#include "base/strings/string16.h"

@@ -34,7 +35,6 @@

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

#include "components/invalidation/public/invalidation_service.h"

#include "components/pref_registry/pref_registry_syncable.h"

-#include "components/prefs/json_pref_store.h"

#include "components/signin/core/browser/about_signin_internals.h"

#include "components/signin/core/browser/profile_oauth2_token_service.h"

#include "components/signin/core/browser/signin_manager.h"

« no previous file with comments | « components/browser_sync/browser/profile_sync_components_factory_impl.cc ('k') | components/content_settings/DEPS » ('j') | no next file with comments »