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

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

Issue 2354613002: [Sync] Fix namespaces for the browser_sync component. (Closed)
Patch Set: Address comments. 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
« no previous file with comments | « chrome/browser/sync/glue/sync_start_util.cc ('k') | chrome/browser/sync/profile_sync_service_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 de015e3bf6d4fd2f6852bc33684ad7e01fa3eda0..dd8a032a13b6215a463c4328237a75e3914e10bf 100644
--- a/chrome/browser/sync/profile_sync_service_android.h
+++ b/chrome/browser/sync/profile_sync_service_android.h
@@ -20,13 +20,16 @@
#include "google/cacheinvalidation/include/types.h"
#include "google_apis/gaia/google_service_auth_error.h"
+class Profile;
+
+namespace browser_sync {
+class ProfileSyncService;
+}
+
namespace sync_driver {
class SyncSetupInProgressHandle;
}
-class Profile;
-class ProfileSyncService;
-
// Android wrapper of the ProfileSyncService which provides access from the Java
// layer. Note that on Android, there's only a single profile, and therefore
// a single instance of this wrapper. The name of the Java class is
@@ -199,7 +202,7 @@ class ProfileSyncServiceAndroid : public sync_driver::SyncServiceObserver {
Profile* profile_;
// A reference to the sync service for this profile.
- ProfileSyncService* sync_service_;
+ browser_sync::ProfileSyncService* sync_service_;
// Prevents Sync from running until configuration is complete.
std::unique_ptr<sync_driver::SyncSetupInProgressHandle> sync_blocker_;
« no previous file with comments | « chrome/browser/sync/glue/sync_start_util.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