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

chrome/browser/sync/sync_ui_util.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_SYNC_SYNC_UI_UTIL_H_
 #define CHROME_BROWSER_SYNC_SYNC_UI_UTIL_H_
 
 #include "base/strings/string16.h"
 #include "build/build_config.h"
 
@@ skipping 11 matching lines @@
 enum MessageType {
   PRE_SYNCED,  // User has not set up sync.
   SYNCED,      // We are synced and authenticated to a gmail account.
   SYNC_ERROR,  // A sync error (such as invalid credentials) has occurred.
   SYNC_PROMO,  // A situation has occurred which should be brought to the user's
                // attention, but not as an error.
 };
 
 // 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 {
   PLAIN_TEXT,  // Label will be plain-text only.
   WITH_HTML    // Label may contain an HTML-formatted link.
 };
 
 // Sync errors that should be exposed to the user through the avatar button.
 enum AvatarSyncErrorType {
   NO_SYNC_ERROR,                     // No sync error.
   MANAGED_USER_UNRECOVERABLE_ERROR,  // Unrecoverable error for managed users.
   UNRECOVERABLE_ERROR,               // Unrecoverable error for regular users.
   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,
 // and use const ProfileSyncService& service where possible.
 
 // Create status and link labels for the current status labels and link text
 // by querying |service|.
 // |style| sets the link properties, see |StatusLabelStyle|.
 MessageType GetStatusLabels(Profile* profile,
                             browser_sync::ProfileSyncService* service,
                             const SigninManagerBase& signin,
                             StatusLabelStyle style,
                             base::string16* status_label,
                             base::string16* link_label,
                             ActionType* action_type);
 
 // Same as above but for use specifically on the New Tab Page.
 // |status_label| may contain an HTML-formatted link.
 MessageType GetStatusLabelsForNewTabPage(
     Profile* profile,
     browser_sync::ProfileSyncService* service,
     const SigninManagerBase& signin,
     base::string16* status_label,
     base::string16* link_label);
 
 #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,
                       browser_sync::ProfileSyncService* service,
                       const SigninManagerBase& signin);
 
 }  // namespace sync_ui_util
 #endif  // CHROME_BROWSER_SYNC_SYNC_UI_UTIL_H_