chrome/browser/sync/profile_sync_service.h - Issue 9699057: [Sync] Move 'sync' target to sync/

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 9699057: [Sync] Move 'sync' target to sync/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address Tim's comments Created 8 years, 9 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/sync/profile_sync_service.h

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

index c4a1ae401bb66029d651ea25869b01dc73093755..6aa03b7961bbdef64033738d544b596c8e515e5f 100644

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

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

@@ -21,16 +21,12 @@

#include "base/timer.h"

#include "chrome/browser/profiles/profile_keyed_service.h"

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

-#include "chrome/browser/sync/engine/model_safe_worker.h"

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

#include "chrome/browser/sync/glue/data_type_controller.h"

#include "chrome/browser/sync/glue/data_type_manager.h"

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

-#include "chrome/browser/sync/internal_api/includes/unrecoverable_error_handler.h"

#include "chrome/browser/sync/internal_api/sync_manager.h"

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

-#include "chrome/browser/sync/syncable/model_type.h"

-#include "chrome/browser/sync/sync_js_controller.h"

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

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

#include "chrome/common/net/gaia/google_service_auth_error.h"

@@ -38,6 +34,10 @@

#include "content/public/browser/notification_registrar.h"

#include "content/public/browser/notification_types.h"

#include "googleurl/src/gurl.h"

+#include "sync/engine/model_safe_worker.h"

+#include "sync/js/sync_js_controller.h"

+#include "sync/syncable/model_type.h"

+#include "sync/util/unrecoverable_error_handler.h"

class Profile;

class ProfileSyncComponentsFactory;