Chromium Code Reviews| 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..b1a52078fb670a6460abeea95abe71fe0f30b8f7 100644 |
| --- a/chrome/browser/ui/webui/settings/people_handler.h |
| +++ b/chrome/browser/ui/webui/settings/people_handler.h |
| @@ -21,9 +21,12 @@ |
| #include "components/sync/driver/sync_service_observer.h" |
| class LoginUIService; |
| -class ProfileSyncService; |
| class SigninManagerBase; |
| +namespace browser_sync { |
| +class ProfileSyncService; |
| +} |
|
skym
2016/09/22 17:25:59
Closing namespaces.
maxbogue
2016/09/22 19:41:15
Done.
|
| + |
| namespace content { |
| class WebContents; |
| class WebUI; |
| @@ -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); |
| }; |