chrome/browser/sync/profile_sync_service.cc - Issue 1433473007: [NOT FOR REVIEW] Copy of Max's CL with conflicts fixed

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/sync/profile_sync_service.cc

Issue 1433473007: [NOT FOR REVIEW] Copy of Max's CL with conflicts fixed (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pss_strings

Patch Set: 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:

View side-by-side diff with in-line comments

Download patch

Index: chrome/browser/sync/profile_sync_service.cc

diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc

index 1e4140efa694c9a172379ddfd49abc415781a6d0..e574bf9a8bf40f47065f38d6dafd58d9f2459485 100644

--- a/chrome/browser/sync/profile_sync_service.cc

+++ b/chrome/browser/sync/profile_sync_service.cc

@@ -27,8 +27,6 @@

#include "base/threading/thread_restrictions.h"

#include "base/time/time.h"

#include "build/build_config.h"

-#include "chrome/browser/sync/glue/sync_backend_host.h"

-#include "chrome/browser/sync/glue/sync_backend_host_impl.h"

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

#include "components/autofill/core/common/autofill_pref_names.h"

#include "components/browser_sync/common/browser_sync_switches.h"

@@ -46,6 +44,8 @@

#include "components/sync_driver/data_type_controller.h"

#include "components/sync_driver/device_info.h"

#include "components/sync_driver/glue/chrome_report_unrecoverable_error.h"

+#include "components/sync_driver/glue/sync_backend_host.h"

+#include "components/sync_driver/glue/sync_backend_host_impl.h"

#include "components/sync_driver/pref_names.h"

#include "components/sync_driver/signin_manager_wrapper.h"

#include "components/sync_driver/sync_api_component_factory.h"

« no previous file with comments | « chrome/browser/sync/profile_sync_service.h ('k') | chrome/browser/sync/profile_sync_service_startup_unittest.cc » ('j') | no next file with comments »