[sync] Display an error when sync settings aren't confirmed

chrome/browser/sync/sync_ui_util.h

Index: chrome/browser/sync/sync_ui_util.h
diff --git a/chrome/browser/sync/sync_ui_util.h b/chrome/browser/sync/sync_ui_util.h
index fcd841cb580867c231866a2e9f752e02543a4079..a416fa4cf6fc698c74a335d24477fd3cdfa5d1d6 100644
--- a/chrome/browser/sync/sync_ui_util.h
+++ b/chrome/browser/sync/sync_ui_util.h
@@ -29,11 +29,12 @@ enum MessageType {
 
 // The action associated with the sync status.
 enum ActionType {
-  NO_ACTION,           // No action to take.
-  REAUTHENTICATE,      // User needs to reauthenticate.
-  SIGNOUT_AND_SIGNIN,  // User needs to sign out and sign in.
-  UPGRADE_CLIENT,      // User needs to upgrade the client.
-  ENTER_PASSPHRASE,    // User needs to enter their passphrase.
+  NO_ACTION,              // No action to take.
+  REAUTHENTICATE,         // User needs to reauthenticate.
+  SIGNOUT_AND_SIGNIN,     // User needs to sign out and sign in.
+  UPGRADE_CLIENT,         // User needs to upgrade the client.
+  ENTER_PASSPHRASE,       // User needs to enter their passphrase.
+  CONFIRM_SYNC_SETTINGS,  // User needs to confirm sync settings.
 };
 
 enum StatusLabelStyle {
@@ -49,7 +50,8 @@ enum AvatarSyncErrorType {
   SUPERVISED_USER_AUTH_ERROR,        // Auth token error for supervised users.
   AUTH_ERROR,                        // Authentication error.
   UPGRADE_CLIENT_ERROR,              // Out-of-date client error.
-  PASSPHRASE_ERROR                   // Sync passphrase error.
+  PASSPHRASE_ERROR,                  // Sync passphrase error.
+  SETTINGS_UNCONFIRMED_ERROR,        // Sync settings dialog not confirmed yet.
 };
 
 // TODO(akalin): audit the use of ProfileSyncService* service below,
@@ -78,9 +80,11 @@ MessageType GetStatusLabelsForNewTabPage(
 #if !defined(OS_CHROMEOS)
 // Gets the error message and button label for the sync errors that should be
 // exposed to the user through the titlebar avatar button.
-AvatarSyncErrorType GetMessagesForAvatarSyncError(Profile* profile,
-                                                  int* content_string_id,
-                                                  int* button_string_id);
+AvatarSyncErrorType GetMessagesForAvatarSyncError(
+    Profile* profile,
+    const SigninManagerBase& signin,
+    int* content_string_id,
+    int* button_string_id);
 #endif
 
 MessageType GetStatus(Profile* profile,