Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7262)

Issues Search
    My Issues | Starred     Open | Closed | All

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: Addressed comments 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:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/sync/profile_sync_service_android.cc ('K') | « chrome/browser/sync/sync_prefs.cc ('k') | sync/android/java/src/org/chromium/sync/internal_api/pub/SyncDecryptionPassphraseType.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 1cbdb835a189044eca25dd65e00eedcdd06c9953..f5f36204e685fb25a01f58f1ad43c0910d49468b 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2063,6 +2063,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',
@@ -3127,6 +3129,7 @@
'android/java/src/org/chromium/chrome/browser/JavascriptAppModalDialog.java',
'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/sync/ProfileSyncService.java',
'android/java/src/org/chromium/chrome/browser/TabBase.java',
'android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java',
],
« chrome/browser/sync/profile_sync_service_android.cc ('K') | « chrome/browser/sync/sync_prefs.cc ('k') | sync/android/java/src/org/chromium/sync/internal_api/pub/SyncDecryptionPassphraseType.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698