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

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: Reformat, remove browser_options change Created 3 years, 6 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..59697f9122dda209e7011403215a5fedf434d60b 100644
--- a/chrome/browser/ui/avatar_button_error_controller.cc
+++ b/chrome/browser/ui/avatar_button_error_controller.cc
@@ -94,7 +94,8 @@ 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->IsSyncConfirmationNeeded();
}
return false;
}
« no previous file with comments | « chrome/browser/sync/sync_ui_util_unittest.cc ('k') | chrome/browser/ui/cocoa/profiles/avatar_button_controller_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698