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

Unified Diff: chrome/browser/ui/webui/settings/people_handler.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
Index: chrome/browser/ui/webui/settings/people_handler.h
diff --git a/chrome/browser/ui/webui/settings/people_handler.h b/chrome/browser/ui/webui/settings/people_handler.h
index 98303b2409061d84f8d63967897280f52153cf0d..b7852d4204ef6c488998dae6e4c36d7ee31e1236 100644
--- a/chrome/browser/ui/webui/settings/people_handler.h
+++ b/chrome/browser/ui/webui/settings/people_handler.h
@@ -21,21 +21,24 @@
#include "components/sync/driver/sync_service_observer.h"
class LoginUIService;
-class ProfileSyncService;
class SigninManagerBase;
+namespace browser_sync {
+class ProfileSyncService;
+} // namespace browser_sync
+
namespace content {
class WebContents;
class WebUI;
-}
+} // namespace content
namespace signin_metrics {
enum class AccessPoint;
-}
+} // namespace signin_metrics
namespace sync_driver {
class SyncSetupInProgressHandle;
-}
+} // namespace sync_driver
namespace settings {
@@ -124,7 +127,7 @@ class PeopleHandler : public SettingsPageUIHandler,
// Helper routine that gets the ProfileSyncService associated with the parent
// profile.
- ProfileSyncService* GetSyncService() const;
+ browser_sync::ProfileSyncService* GetSyncService() const;
// Returns the LoginUIService for the parent profile.
LoginUIService* GetLoginUIService() const;
@@ -195,7 +198,8 @@ class PeopleHandler : public SettingsPageUIHandler,
// Manages observer lifetimes.
ScopedObserver<SigninManagerBase, PeopleHandler> signin_observer_;
- ScopedObserver<ProfileSyncService, PeopleHandler> sync_service_observer_;
+ ScopedObserver<browser_sync::ProfileSyncService, PeopleHandler>
+ sync_service_observer_;
DISALLOW_COPY_AND_ASSIGN(PeopleHandler);
};
« no previous file with comments | « chrome/browser/ui/webui/options/sync_setup_handler_unittest.cc ('k') | chrome/browser/ui/webui/settings/people_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698