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

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

Index: chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm
diff --git a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm
index 328a875de2aaf489e73b14c1d5577de94c879db3..0812c3152da6509887040a6d8608e117aeee9b26 100644
--- a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm
+++ b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm
@@ -1868,6 +1868,9 @@ class ActiveProfileObserverBridge : public AvatarMenuObserver,
     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;
@@ -1895,19 +1898,22 @@ class ActiveProfileObserverBridge : public AvatarMenuObserver,
   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);
+    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 =