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

Unified Diff: chrome/browser/sync/profile_sync_service_android.cc

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:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/profile_sync_service_android.cc
diff --git a/chrome/browser/sync/profile_sync_service_android.cc b/chrome/browser/sync/profile_sync_service_android.cc
index 9717168b79817efe71c48a37d575cf895f5a79bb..8ee0e7a30300c115417ff1670a8a688dcb6f37d5 100644
--- a/chrome/browser/sync/profile_sync_service_android.cc
+++ b/chrome/browser/sync/profile_sync_service_android.cc
@@ -22,9 +22,9 @@
#include "chrome/browser/sync/about_sync_util.h"
#include "chrome/browser/sync/profile_sync_service.h"
#include "chrome/browser/sync/profile_sync_service_factory.h"
-#include "chrome/browser/sync/sync_prefs.h"
#include "chrome/browser/sync/sync_ui_util.h"
-#include "chrome/common/pref_names.h"
+#include "components/sync_driver/pref_names.h"
+#include "components/sync_driver/sync_prefs.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/notification_service.h"
#include "content/public/browser/notification_source.h"
@@ -70,7 +70,7 @@ ProfileSyncServiceAndroid::ProfileSyncServiceAndroid(JNIEnv* env, jobject obj)
return;
}
- sync_prefs_.reset(new browser_sync::SyncPrefs(profile_->GetPrefs()));
+ sync_prefs_.reset(new sync_driver::SyncPrefs(profile_->GetPrefs()));
sync_service_ =
ProfileSyncServiceFactory::GetInstance()->GetForProfile(profile_);
@@ -472,7 +472,7 @@ jlong ProfileSyncServiceAndroid::GetLastSyncedTimeForTest(
// conversion, since SyncPrefs::GetLastSyncedTime() converts the stored value
// to to base::Time.
return static_cast<jlong>(
- profile_->GetPrefs()->GetInt64(prefs::kSyncLastSyncedTime));
+ profile_->GetPrefs()->GetInt64(sync_driver::prefs::kSyncLastSyncedTime));
}
void ProfileSyncServiceAndroid::NudgeSyncer(JNIEnv* env,
« no previous file with comments | « chrome/browser/sync/profile_sync_service_android.h ('k') | chrome/browser/sync/profile_sync_service_startup_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698