Migrate signin error messages to the new avatar bubble

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 <Cocoa/Cocoa.h>
 
 #import "chrome/browser/ui/cocoa/profiles/profile_chooser_controller.h"
 
 #include "base/mac/bundle_locations.h"
 #include "base/prefs/pref_service.h"
@@ skipping 273 matching lines @@
     token_observer_registered_ = false;
   }
 
   // OAuth2TokenService::Observer:
   virtual void OnRefreshTokenAvailable(const std::string& account_id) OVERRIDE {
     // Tokens can only be added by adding an account through the inline flow,
     // which is started from the account management view. Refresh it to show the
     // update.
     profiles::BubbleViewMode viewMode = [controller_ viewMode];
     if (viewMode == profiles::BUBBLE_VIEW_MODE_ACCOUNT_MANAGEMENT ||
-        viewMode == profiles::BUBBLE_VIEW_MODE_GAIA_SIGNIN ||
         viewMode == profiles::BUBBLE_VIEW_MODE_GAIA_ADD_ACCOUNT ||
         viewMode == profiles::BUBBLE_VIEW_MODE_GAIA_REAUTH) {
-      if (viewMode == profiles::BUBBLE_VIEW_MODE_GAIA_SIGNIN)
-        [controller_ setTutorialMode:profiles::TUTORIAL_MODE_CONFIRM_SIGNIN];
       [controller_ initMenuContentsWithView:
           switches::IsEnableAccountConsistency() ?
               profiles::BUBBLE_VIEW_MODE_ACCOUNT_MANAGEMENT :
               profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER];
     }
   }
 
   virtual void OnRefreshTokenRevoked(const std::string& account_id) OVERRIDE {
     // Tokens can only be removed from the account management view. Refresh it
     // to show the update.
@@ skipping 489 matching lines @@
 // 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*)buildWelcomeUpgradeTutorialViewIfNeeded;
 
 // Builds a tutorial card to have the user confirm the last Chrome signin,
 // Chrome sync will be delayed until the user either dismisses the tutorial, or
 // configures sync through the "Settings" link.
 - (NSView*)buildSigninConfirmationView;
 
+// Builds a tutorial card to show the last signin error.
+- (NSView*)buildSigninErrorView;
+
 // Creates the main profile card for the profile |item| at the top of
 // the bubble.
 - (NSView*)createCurrentProfileView:(const AvatarMenu::Item&)item;
 
 // Creates the possible links for the main profile card with profile |item|.
 - (NSView*)createCurrentProfileLinksForItem:(const AvatarMenu::Item&)item
                                        rect:(NSRect)rect;
 
 // Creates the disclaimer text for supervised users, telling them that the
 // manager can view their history etc.
@@ skipping 154 matching lines @@
   ProfileMetrics::LogProfileNewAvatarMenuUpgrade(
       ProfileMetrics::PROFILE_AVATAR_MENU_UPGRADE_WHATS_NEW);
 }
 
 - (IBAction)showSwitchUserView:(id)sender {
   [self initMenuContentsWithView:profiles::BUBBLE_VIEW_MODE_SWITCH_USER];
   ProfileMetrics::LogProfileNewAvatarMenuUpgrade(
       ProfileMetrics::PROFILE_AVATAR_MENU_UPGRADE_NOT_YOU);
 }
 
+- (IBAction)showLearnMorePage:(id)sender {
+  // TODO(guohui): updates the code once the URL is available.
+}
+
 - (IBAction)configureSyncSettings:(id)sender {
   tutorialMode_ = profiles::TUTORIAL_MODE_NONE;
   LoginUIServiceFactory::GetForProfile(browser_->profile())->
       SyncConfirmationUIClosed(true);
   ProfileMetrics::LogProfileNewAvatarMenuSignin(
       ProfileMetrics::PROFILE_AVATAR_MENU_SIGNIN_SETTINGS);
 }
 
 - (IBAction)syncSettingsConfirmed:(id)sender {
   tutorialMode_ = profiles::TUTORIAL_MODE_NONE;
@@ skipping 155 matching lines @@
         switch (tutorialMode_) {
           case profiles::TUTORIAL_MODE_NONE:
           case profiles::TUTORIAL_MODE_WELCOME_UPGRADE:
             tutorialView =
                 [self buildWelcomeUpgradeTutorialViewIfNeeded];
             break;
           case profiles::TUTORIAL_MODE_CONFIRM_SIGNIN:
             tutorialView = [self buildSigninConfirmationView];
             break;
           case profiles::TUTORIAL_MODE_SHOW_ERROR:
-            // TODO(guohui): not implemented yet.
-            NOTREACHED();
+            tutorialView = [self buildSigninErrorView];
         }
       }
       currentProfileView = [self createCurrentProfileView:item];
       enableLock = switches::IsNewProfileManagement() && item.signed_in;
     } else {
       [otherProfiles addObject:[self createOtherProfileView:i]];
     }
   }
   if (!currentProfileView)  // Guest windows don't have an active profile.
     currentProfileView = [self createGuestProfileView];
@@ skipping 94 matching lines @@
                        titleMessage:titleMessage
                      contentMessage:contentMessage
                         linkMessage:linkMessage
                       buttonMessage:buttonMessage
                         stackButton:NO
                      hasCloseButton:NO
                          linkAction:@selector(configureSyncSettings:)
                        buttonAction:@selector(syncSettingsConfirmed:)];
 }
 
+- (NSView*)buildSigninErrorView {
+  NSString* titleMessage = l10n_util::GetNSString(
+      IDS_PROFILES_ERROR_TUTORIAL_TITLE);
+  LoginUIService* login_ui_service =

[Alexei Svitkine (slow), 2014/08/19 19:06:22]

Nit: camelCase

[guohui, 2014/08/19 19:51:03]

Done.

+      LoginUIServiceFactory::GetForProfile(browser_->profile());
+  NSString* contentMessage =
+      base::SysUTF16ToNSString(login_ui_service->GetLastLoginResult());
+  NSString* linkMessage = l10n_util::GetNSString(
+      IDS_PROFILES_PROFILE_TUTORIAL_LEARN_MORE);
+  return [self tutorialViewWithMode:profiles::TUTORIAL_MODE_CONFIRM_SIGNIN
+                       titleMessage:titleMessage
+                     contentMessage:contentMessage
+                        linkMessage:linkMessage
+                      buttonMessage:nil
+                        stackButton:NO
+                     hasCloseButton:YES
+                         linkAction:@selector(showLearnMorePage:)
+                       buttonAction:nil];
+}
+
 - (NSView*)buildWelcomeUpgradeTutorialViewIfNeeded {
   Profile* profile = browser_->profile();
   const AvatarMenu::Item& avatarItem =
       avatarMenu_->GetItemAt(avatarMenu_->GetActiveProfileIndex());
 
   const int showCount = profile->GetPrefs()->GetInteger(
       prefs::kProfileAvatarTutorialShown);
   // Do not show the tutorial if user has dismissed it.
   if (showCount > signin_ui_util::kUpgradeWelcomeTutorialShowMax)
     return nil;
@@ skipping 44 matching lines @@
 
   NSColor* tutorialBackgroundColor =
       gfx::SkColorToSRGBNSColor(profiles::kAvatarTutorialBackgroundColor);
   base::scoped_nsobject<NSView> container([[BackgroundColorView alloc]
       initWithFrame:NSMakeRect(0, 0, kFixedMenuWidth, 0)
           withColor:tutorialBackgroundColor]);
   CGFloat availableWidth = kFixedMenuWidth - 2 * kHorizontalSpacing;
   CGFloat yOffset = kVerticalSpacing;
 
   // Adds links and buttons at the bottom.
-  base::scoped_nsobject<NSButton> tutorialOkButton([[HoverButton alloc]
-      initWithFrame:NSZeroRect]);
-  [tutorialOkButton setTitle:buttonMessage];
-  [tutorialOkButton setBezelStyle:NSRoundedBezelStyle];
-  [tutorialOkButton setTarget:self];
-  [tutorialOkButton setAction:buttonAction];
-  [tutorialOkButton setAlignment:NSCenterTextAlignment];
-  [tutorialOkButton sizeToFit];
+  base::scoped_nsobject<NSButton> tutorialOkButton;
+  if (buttonMessage) {
+    tutorialOkButton.reset([[HoverButton alloc] initWithFrame:NSZeroRect]);
+    [tutorialOkButton setTitle:buttonMessage];
+    [tutorialOkButton setBezelStyle:NSRoundedBezelStyle];
+    [tutorialOkButton setTarget:self];
+    [tutorialOkButton setAction:buttonAction];
+    [tutorialOkButton setAlignment:NSCenterTextAlignment];
+    [tutorialOkButton sizeToFit];
+  }
 
   NSButton* learnMoreLink = nil;
   if (linkMessage) {
     learnMoreLink = [self linkButtonWithTitle:linkMessage
                                   frameOrigin:NSZeroPoint
                                        action:linkAction];
     [[learnMoreLink cell] setTextColor:[NSColor whiteColor]];
   }
 
   if (stackButton) {
-    if (learnMoreLink) {
+    if (linkMessage) {
       [learnMoreLink setFrameOrigin:NSMakePoint(
           (kFixedMenuWidth - NSWidth([learnMoreLink frame])) / 2, yOffset)];
     }
     [tutorialOkButton setFrameSize:NSMakeSize(
         availableWidth, NSHeight([tutorialOkButton frame]))];
     [tutorialOkButton setFrameOrigin:NSMakePoint(
         kHorizontalSpacing,
         yOffset + (learnMoreLink ? NSHeight([learnMoreLink frame]) : 0))];
   } else {
-    NSSize buttonSize = [tutorialOkButton frame].size;
-    const CGFloat kTopBottomTextPadding = 6;
-    const CGFloat kLeftRightTextPadding = 15;
-    buttonSize.width += 2 * kLeftRightTextPadding;
-    buttonSize.height += 2 * kTopBottomTextPadding;
-    [tutorialOkButton setFrameSize:buttonSize];
-    CGFloat buttonXOffset = kFixedMenuWidth -
-        NSWidth([tutorialOkButton frame]) - kHorizontalSpacing;
-    [tutorialOkButton setFrameOrigin:NSMakePoint(buttonXOffset, yOffset)];
+    if (buttonMessage) {
+      NSSize buttonSize = [tutorialOkButton frame].size;
+      const CGFloat kTopBottomTextPadding = 6;
+      const CGFloat kLeftRightTextPadding = 15;
+      buttonSize.width += 2 * kLeftRightTextPadding;
+      buttonSize.height += 2 * kTopBottomTextPadding;
+      [tutorialOkButton setFrameSize:buttonSize];
+      CGFloat buttonXOffset = kFixedMenuWidth -
+          NSWidth([tutorialOkButton frame]) - kHorizontalSpacing;
+      [tutorialOkButton setFrameOrigin:NSMakePoint(buttonXOffset, yOffset)];
+    }
 
-    if (learnMoreLink) {
-      CGFloat linkYOffset = yOffset + (NSHeight([tutorialOkButton frame]) -
-                                       NSHeight([learnMoreLink frame])) / 2;
+    if (linkMessage) {
+      CGFloat linkYOffset = yOffset;
+      if(buttonMessage) {

[Alexei Svitkine (slow), 2014/08/19 19:06:22]

Nit: Space after if

[guohui, 2014/08/19 19:51:03]

Done.

+        linkYOffset += (NSHeight([tutorialOkButton frame]) -
+                        NSHeight([learnMoreLink frame])) / 2;
+      }
       [learnMoreLink setFrameOrigin:NSMakePoint(
           kHorizontalSpacing, linkYOffset)];
     }
   }
 
-  [container addSubview:tutorialOkButton];
-  if (learnMoreLink) {
+  if (buttonMessage) {
+    [container addSubview:tutorialOkButton];
+    yOffset = NSMaxY([tutorialOkButton frame]);
+  }
+
+  if (linkMessage) {
     [container addSubview:learnMoreLink];
-    yOffset = std::max(NSMaxY([learnMoreLink frame]),
-                       NSMaxY([tutorialOkButton frame])) + kVerticalSpacing;
-  } else {
-    yOffset = NSMaxY([tutorialOkButton frame]) + kVerticalSpacing;
+    yOffset = std::max(NSMaxY([learnMoreLink frame]), yOffset);
   }
 
+  yOffset += kVerticalSpacing;
+
   // Adds body content.
   NSTextField* contentLabel = BuildLabel(
       contentMessage,
       NSMakePoint(kHorizontalSpacing, yOffset),
       gfx::SkColorToSRGBNSColor(profiles::kAvatarTutorialContentTextColor));
   [contentLabel setFrameSize:NSMakeSize(availableWidth, 0)];
   [GTMUILocalizerAndLayoutTweaker sizeToFitFixedWidthTextField:contentLabel];
   [container addSubview:contentLabel];
   yOffset = NSMaxY([contentLabel frame]) + kSmallVerticalSpacing;
 
@@ skipping 717 matching lines @@
 }
 
 - (bool)shouldShowGoIncognito {
   bool incognitoAvailable =
       IncognitoModePrefs::GetAvailability(browser_->profile()->GetPrefs()) !=
           IncognitoModePrefs::DISABLED;
   return incognitoAvailable && !browser_->profile()->IsGuestSession();
 }
 
 @end