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

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

Issue 2376123003: [Sync] Move //components/sync to the syncer namespace. (Closed)
Patch Set: Rebase. Created 4 years, 3 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.h
diff --git a/chrome/browser/sync/profile_sync_service_android.h b/chrome/browser/sync/profile_sync_service_android.h
index dd8a032a13b6215a463c4328237a75e3914e10bf..12dc4aa50511cced906a38c240022129e3595598 100644
--- a/chrome/browser/sync/profile_sync_service_android.h
+++ b/chrome/browser/sync/profile_sync_service_android.h
@@ -8,6 +8,7 @@
#include <jni.h>
#include <map>
+#include <memory>
#include "base/android/jni_weak_ref.h"
#include "base/callback.h"
@@ -26,7 +27,7 @@ namespace browser_sync {
class ProfileSyncService;
}
-namespace sync_driver {
+namespace syncer {
class SyncSetupInProgressHandle;
}
@@ -35,9 +36,8 @@ class SyncSetupInProgressHandle;
// a single instance of this wrapper. The name of the Java class is
// ProfileSyncService.
// This class should only be accessed from the UI thread.
-class ProfileSyncServiceAndroid : public sync_driver::SyncServiceObserver {
+class ProfileSyncServiceAndroid : public syncer::SyncServiceObserver {
public:
-
ProfileSyncServiceAndroid(JNIEnv* env, jobject obj);
~ProfileSyncServiceAndroid() override;
@@ -45,7 +45,7 @@ class ProfileSyncServiceAndroid : public sync_driver::SyncServiceObserver {
// Returns false if we didn't get a ProfileSyncService.
bool Init();
- // sync_driver::SyncServiceObserver:
+ // syncer::SyncServiceObserver:
void OnStateChanged() override;
// Pure ProfileSyncService calls.
@@ -205,11 +205,11 @@ class ProfileSyncServiceAndroid : public sync_driver::SyncServiceObserver {
browser_sync::ProfileSyncService* sync_service_;
// Prevents Sync from running until configuration is complete.
- std::unique_ptr<sync_driver::SyncSetupInProgressHandle> sync_blocker_;
+ std::unique_ptr<syncer::SyncSetupInProgressHandle> sync_blocker_;
// The class that handles getting, setting, and persisting sync
// preferences.
- std::unique_ptr<sync_driver::SyncPrefs> sync_prefs_;
+ std::unique_ptr<syncer::SyncPrefs> sync_prefs_;
// Java-side ProfileSyncService object.
JavaObjectWeakGlobalRef weak_java_profile_sync_service_;
« no previous file with comments | « chrome/browser/sync/glue/theme_data_type_controller.cc ('k') | chrome/browser/sync/profile_sync_service_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698