chrome/chrome_browser.gypi - Issue 12313075: [sync] Upstream the Android ProfileSyncService

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/chrome_browser.gypi

Issue 12313075: [sync] Upstream the Android ProfileSyncService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased which required moving strings to GRD. Removed unused imports and fixed a long line. Created 7 years, 10 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/chrome_browser.gypi

diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi

index 5ec1d7680445664b242f174d4962007219e5058e..1d61c1061ef2570ccf2e4580f89ebb8d38f626d8 100644

--- a/chrome/chrome_browser.gypi

+++ b/chrome/chrome_browser.gypi

@@ -2072,6 +2072,8 @@

'browser/sync/profile_sync_components_factory_impl.h',

'browser/sync/profile_sync_service.cc',

'browser/sync/profile_sync_service.h',

+ 'browser/sync/profile_sync_service_android.cc',

+ 'browser/sync/profile_sync_service_android.h',

'browser/sync/profile_sync_service_factory.cc',

'browser/sync/profile_sync_service_factory.h',

'browser/sync/profile_sync_service_harness.cc',

@@ -3135,6 +3137,7 @@

'android/java/src/org/chromium/chrome/browser/NavigationPopup.java',

'android/java/src/org/chromium/chrome/browser/ProcessUtils.java',

'android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java',

+ 'android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java',

'android/java/src/org/chromium/chrome/browser/TabBase.java',

'android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java',