| Index: chrome/browser/ui/avatar_button_error_controller.cc
|
| diff --git a/chrome/browser/ui/avatar_button_error_controller.cc b/chrome/browser/ui/avatar_button_error_controller.cc
|
| index 50b6d65a7a534d38506b4d0cdd7165beab600894..86475d2d9cc160e0d8206066aa7c7de86e93b69b 100644
|
| --- a/chrome/browser/ui/avatar_button_error_controller.cc
|
| +++ b/chrome/browser/ui/avatar_button_error_controller.cc
|
| @@ -84,12 +84,12 @@ void AvatarButtonErrorController::SyncErrorObserver::OnErrorChanged() {
|
| }
|
|
|
| bool AvatarButtonErrorController::SyncErrorObserver::HasSyncError() {
|
| - ProfileSyncService* sync_service =
|
| + browser_sync::ProfileSyncService* sync_service =
|
| ProfileSyncServiceFactory::GetForProfile(profile_);
|
| if (switches::IsMaterialDesignUserMenu() && sync_service) {
|
| SyncErrorController* sync_error_controller =
|
| sync_service->sync_error_controller();
|
| - ProfileSyncService::Status status;
|
| + browser_sync::ProfileSyncService::Status status;
|
| sync_service->QueryDetailedSyncStatus(&status);
|
| return sync_service->HasUnrecoverableError() ||
|
| status.sync_protocol_error.action == syncer::UPGRADE_CLIENT ||
|
| @@ -102,7 +102,7 @@ SyncErrorController* AvatarButtonErrorController::SyncErrorObserver::
|
| GetSyncErrorControllerIfNeeded() {
|
| if (!switches::IsMaterialDesignUserMenu())
|
| return nullptr;
|
| - ProfileSyncService* sync_service =
|
| + browser_sync::ProfileSyncService* sync_service =
|
| ProfileSyncServiceFactory::GetForProfile(profile_);
|
| return sync_service ? sync_service->sync_error_controller() : nullptr;
|
| }
|
|
|