Migrate signin error messages to the new avatar bubble

chrome/browser/ui/cocoa/profiles/avatar_base_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/avatar_base_controller.h"
 
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_info_cache_observer.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
@@ skipping 123 matching lines @@
 }
 
 - (NSButton*)buttonView {
   CHECK(button_.get());  // Subclasses must set this.
   return button_.get();
 }
 
 - (void)showAvatarBubble:(NSView*)anchor
                 withMode:(BrowserWindow::AvatarBubbleMode)mode
          withServiceType:(signin::GAIAServiceType)serviceType {
-  if (menuController_)
+  if (menuController_) {
+    if (switches::IsNewAvatarMenu()) {
+      profiles::BubbleViewMode viewMode;
+      profiles::TutorialMode tutorialMode;
+      profiles::BubbleViewModeFromAvatarBubbleMode(
+          mode, &viewMode, &tutorialMode);
+      if (tutorialMode != profiles::TUTORIAL_MODE_NONE) {
+        ProfileChooserController* profileChooserController =
+            base::mac::ObjCCastStrict<ProfileChooserController*>(
+                menuController_);
+        [profileChooserController setTutorialMode:tutorialMode];
+        [profileChooserController initMenuContentsWithView:viewMode];
+      }
+    }
     return;
+  }
 
   DCHECK(chrome::IsCommandEnabled(browser_, IDC_SHOW_AVATAR_MENU));
 
   NSWindowController* wc =
       [browser_->window()->GetNativeWindow() windowController];
   if ([wc isKindOfClass:[BrowserWindowController class]]) {
     [static_cast<BrowserWindowController*>(wc)
         lockBarVisibilityForOwner:self withAnimation:NO delay:NO];
   }
 
@@ skipping 57 matching lines @@
 }
 
 - (void)updateErrorStatus:(BOOL)hasError {
 }
 
 - (BaseBubbleController*)menuController {
   return menuController_;
 }
 
 @end