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

Unified Diff: chrome/browser/ui/avatar_button_error_controller.cc

Issue 2920853004: [sync] Display an error when sync settings aren't confirmed (Closed)
Patch Set: Created 3 years, 7 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/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 b4a0ff4562488cefe331beab416fbf29dc2e1999..161fc8ff0399fb216b5396389be064e357b2281d 100644
--- a/chrome/browser/ui/avatar_button_error_controller.cc
+++ b/chrome/browser/ui/avatar_button_error_controller.cc
@@ -94,7 +94,9 @@ bool AvatarButtonErrorController::SyncErrorObserver::HasSyncError() {
sync_service->QueryDetailedSyncStatus(&status);
return sync_service->HasUnrecoverableError() ||
status.sync_protocol_error.action == syncer::UPGRADE_CLIENT ||
- (sync_error_controller && sync_error_controller->HasError());
+ (sync_error_controller && sync_error_controller->HasError()) ||
+ (!sync_service->IsFirstSetupComplete() &&
skym 2017/06/01 19:48:44 I've seen these two booleans checked before in thi
Patrick Noland 2017/06/07 19:07:23 Done.
+ sync_service->IsSyncRequested());
}
return false;
}

Powered by Google App Engine
This is Rietveld 408576698