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

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

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

index dae8f40163052e7e154d33cdeba8eee4e3267a47..e9f8ed0647a46a9bb4a79b291c96914693665bac 100644

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

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

@@ -23,8 +23,8 @@

#include "base/threading/thread_restrictions.h"

#include "chrome/browser/about_flags.h"

#include "chrome/browser/browser_process.h"

-#include "chrome/browser/net/chrome_cookie_notification_details.h"

#include "chrome/browser/defaults.h"

+#include "chrome/browser/net/chrome_cookie_notification_details.h"

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

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

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

@@ -40,11 +40,8 @@

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

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

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

-#include "chrome/browser/sync/js/js_arg_list.h"

-#include "chrome/browser/sync/js/js_event_details.h"

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

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

-#include "chrome/browser/sync/util/cryptographer.h"

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

#include "chrome/browser/ui/browser_list.h"

#include "chrome/browser/ui/browser_window.h"

@@ -62,6 +59,9 @@

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

#include "grit/generated_resources.h"

#include "net/base/cookie_monster.h"

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

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

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

#include "ui/base/l10n/l10n_util.h"

using browser_sync::ChangeProcessor;