chrome/browser/sync/profile_sync_service.h - 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.h

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.h

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

index 3d14332afc3bfdd111d19f01b9e93e8c117ba892..67e91aa495f36104ebaefaf7e1827e6e0ddc2f6f 100644

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

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

@@ -22,7 +22,6 @@

#include "base/threading/thread_checker.h"

#include "base/time/time.h"

#include "base/timer/timer.h"

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

#include "components/keyed_service/core/keyed_service.h"

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

#include "components/sync_driver/backup_rollback_controller.h"

@@ -31,6 +30,7 @@

#include "components/sync_driver/data_type_manager_observer.h"

#include "components/sync_driver/data_type_status_table.h"

#include "components/sync_driver/device_info_sync_service.h"

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

#include "components/sync_driver/local_device_info_provider.h"

#include "components/sync_driver/protocol_event_observer.h"

#include "components/sync_driver/startup_controller.h"

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