chrome/browser/sync/profile_sync_service_android.h - Issue 195873020: [Sync] Move SyncPrefs into sync_driver component

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

Issue 195873020: [Sync] Move SyncPrefs into sync_driver component (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rerererebase Created 6 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_android.h

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

index 5af9cd817feae8e512619f79f5be7eae091cdded..92451cd4ff8c5c6fa4ce512c2083e78119a87a68 100644

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

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

@@ -13,7 +13,7 @@

#include "base/compiler_specific.h"

#include "base/time/time.h"

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

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

+#include "components/sync_driver/sync_prefs.h"

#include "google/cacheinvalidation/include/types.h"

#include "google_apis/gaia/google_service_auth_error.h"

@@ -222,7 +222,7 @@ class ProfileSyncServiceAndroid : public ProfileSyncServiceObserver {

ProfileSyncService* sync_service_;

// The class that handles getting, setting, and persisting sync

// preferences.

- scoped_ptr<browser_sync::SyncPrefs> sync_prefs_;

+ scoped_ptr<sync_driver::SyncPrefs> sync_prefs_;

// Java-side ProfileSyncService object.

JavaObjectWeakGlobalRef weak_java_profile_sync_service_;