[MD User Menu] New way to handle supervised user auth error

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 945 matching lines @@
                  contentMessage:(NSString*)contentMessage
                     linkMessage:(NSString*)linkMessage
                   buttonMessage:(NSString*)buttonMessage
                     stackButton:(BOOL)stackButton
                  hasCloseButton:(BOOL)hasCloseButton
                      linkAction:(SEL)linkAction
                    buttonAction:(SEL)buttonAction;
 
 // Builds a header for signin and sync error surfacing on the user menu.
 - (NSView*)buildSyncErrorViewIfNeeded;
-- (NSView*)buildSyncErrorViewWithContent:(int)contentStringId
-                          buttonStringId:(int)buttonStringId
-                            buttonAction:(SEL)buttonAction;
 
 // Builds a tutorial card to introduce an upgrade user to the new avatar menu if
 // needed. |tutorial_shown| indicates if the tutorial has already been shown in
 // the previous active view. |avatar_item| refers to the current profile.
 - (NSView*)buildWelcomeUpgradeTutorialView:(const AvatarMenu::Item&)item;
 
 // Builds a tutorial card to inform the user about right-click user switching if
 // needed.
 - (NSView*)buildRightClickTutorialView;
 
@@ skipping 882 matching lines @@
   sync_ui_util::AvatarSyncErrorType error =
       sync_ui_util::GetMessagesForAvatarSyncError(
           browser_->profile(), &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:);
       break;
     case sync_ui_util::NO_SYNC_ERROR:
       return nil;
     default:
       NOTREACHED();
   }
-  return [self buildSyncErrorViewWithContent:contentStringId
-                              buttonStringId:buttonStringId
-                                buttonAction:buttonAction];
-}
 
-- (NSView*)buildSyncErrorViewWithContent:(int)contentStringId
-                          buttonStringId:(int)buttonStringId
-                            buttonAction:(SEL)buttonAction {
   base::scoped_nsobject<NSView> container(
       [[NSView alloc] initWithFrame:NSMakeRect(0, 0, GetFixedMenuWidth(), 0)]);
   CGFloat iconSize = 20.0;
   CGFloat xOffset = kHorizontalSpacing + iconSize + 12.0;
   CGFloat availableWidth = GetFixedMenuWidth() - xOffset - kHorizontalSpacing;
-  CGFloat yOffset = 20.0;
+  CGFloat yOffset = 16.0;
 
   // Adds an action button for resolving the error at the bottom.
-  base::scoped_nsobject<NSButton> resolveErrorButton(
-      [[BlueLabelButton alloc] initWithFrame:NSZeroRect]);
-  [resolveErrorButton setTitle:l10n_util::GetNSString(buttonStringId)];
-  [resolveErrorButton setTarget:self];
-  [resolveErrorButton setAction:buttonAction];
-  [resolveErrorButton setAlignment:NSCenterTextAlignment];
-  [resolveErrorButton sizeToFit];
-  [resolveErrorButton setFrameOrigin:NSMakePoint(xOffset, yOffset)];
-  [container addSubview:resolveErrorButton];
-  yOffset = NSMaxY([resolveErrorButton frame]) + kVerticalSpacing;
+  if (buttonStringId) {
+    DCHECK(buttonAction);

[groby-ooo-7-16, 2016/08/23 15:16:49]

You added a buttonAction = nil case above. Is th DCHECK still appropriate here?

[Jane, 2016/08/23 16:39:38]

Yes - when a button string is returned, that means a button is needed here,
hence DCHECK that a buttonAction has been set. I added a comment here to
clarify.

+    base::scoped_nsobject<NSButton> resolveErrorButton(
+        [[BlueLabelButton alloc] initWithFrame:NSZeroRect]);
+    [resolveErrorButton setTitle:l10n_util::GetNSString(buttonStringId)];
+    [resolveErrorButton setTarget:self];
+    [resolveErrorButton setAction:buttonAction];
+    [resolveErrorButton setAlignment:NSCenterTextAlignment];
+    [resolveErrorButton sizeToFit];
+    [resolveErrorButton setFrameOrigin:NSMakePoint(xOffset, yOffset + 4.0)];
+    [container addSubview:resolveErrorButton];
+    yOffset = NSMaxY([resolveErrorButton frame]) + kVerticalSpacing;
+  }
 
   // Adds the error message content.
   NSTextField* contentLabel =
       BuildLabel(l10n_util::GetNSString(contentStringId),
                  NSMakePoint(xOffset, yOffset), nil);
   [contentLabel setFrameSize:NSMakeSize(availableWidth, 0)];
   [GTMUILocalizerAndLayoutTweaker sizeToFitFixedWidthTextField:contentLabel];
   [container addSubview:contentLabel];
   yOffset = NSMaxY([contentLabel frame]) + 4;
 
@@ skipping 969 matching lines @@
 }
 
 - (bool)shouldShowGoIncognito {
   bool incognitoAvailable =
       IncognitoModePrefs::GetAvailability(browser_->profile()->GetPrefs()) !=
           IncognitoModePrefs::DISABLED;
   return incognitoAvailable && !browser_->profile()->IsGuestSession();
 }
 
 @end