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

chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm

 // Copyright 2014 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.
 
 #import "chrome/browser/ui/cocoa/profiles/profile_chooser_controller.h"
 
 #import <Carbon/Carbon.h>  // kVK_Return.
 #import <Cocoa/Cocoa.h>
 #include <stddef.h>
 
@@ skipping 873 matching lines @@
 
 - (IBAction)showAccountReauthenticationView:(id)sender {
   DCHECK(!isGuestSession_);
   [self showSigninUIForMode:profiles::BUBBLE_VIEW_MODE_GAIA_REAUTH];
 }
 
 - (IBAction)showUpdateChromeView:(id)sender {
   chrome::OpenUpdateChromeDialog(browser_);
 }
 
-- (IBAction)showSyncPassphraseSetupView:(id)sender {
+- (IBAction)showSyncSetupView:(id)sender {
   chrome::ShowSettingsSubPage(browser_, chrome::kSyncSetupSubPage);
 }
 
 - (IBAction)removeAccount:(id)sender {
   DCHECK(!accountIdToRemove_.empty());
   ProfileOAuth2TokenServiceFactory::GetForProfile(browser_->profile())
       ->RevokeCredentials(accountIdToRemove_);
   [self postActionPerformed:ProfileMetrics::PROFILE_DESKTOP_MENU_REMOVE_ACCT];
   accountIdToRemove_.clear();
 
@@ skipping 295 matching lines @@
                                  otherProfiles:otherProfiles.get()
                                      atYOffset:yOffset
                                    inContainer:container
                                       showLock:showLock];
   return container.autorelease();
 }
 
 - (NSView*)buildSyncErrorViewIfNeeded {
   int contentStringId, buttonStringId;
   SEL buttonAction;
+  SigninManagerBase* signinManager =
+      SigninManagerFactory::GetForProfile(browser_->profile());
   sync_ui_util::AvatarSyncErrorType error =
       sync_ui_util::GetMessagesForAvatarSyncError(
-          browser_->profile(), &contentStringId, &buttonStringId);
+          browser_->profile(), *signinManager, &contentStringId,
+          &buttonStringId);
   switch (error) {
     case sync_ui_util::MANAGED_USER_UNRECOVERABLE_ERROR:
       buttonAction = @selector(showSignoutView:);
       break;
     case sync_ui_util::UNRECOVERABLE_ERROR:
       buttonAction = @selector(showSignoutSigninView:);
       break;
     case sync_ui_util::SUPERVISED_USER_AUTH_ERROR:
       buttonAction = nil;
       break;
     case sync_ui_util::AUTH_ERROR:
       buttonAction = @selector(showAccountReauthenticationView:);
       break;
     case sync_ui_util::UPGRADE_CLIENT_ERROR:
       buttonAction = @selector(showUpdateChromeView:);
       break;
     case sync_ui_util::PASSPHRASE_ERROR:
-      buttonAction = @selector(showSyncPassphraseSetupView:);
+    case sync_ui_util::SETTINGS_UNCONFIRMED_ERROR:
+      buttonAction = @selector(showSyncSetupView:);
       break;
     case sync_ui_util::NO_SYNC_ERROR:
       return nil;
     default:
       NOTREACHED();
   }
 
   base::scoped_nsobject<NSView> container(
       [[NSView alloc] initWithFrame:NSMakeRect(0, 0, kFixedMenuWidth, 0)]);
   CGFloat iconSize = 20.0;
@@ skipping 868 matching lines @@
 
 - (void)showWindow:(id)sender {
   [super showWindow:sender];
   NSEvent *event = [[NSApplication sharedApplication] currentEvent];
   if (firstProfileView_ && [event type] == NSKeyDown) {
     [[self window] makeFirstResponder:firstProfileView_];
   }
 }
 
 @end