Revert 288817 "[Mac, Win] Only show the user manager tutorial if..."

trunk/src/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 800 matching lines @@
 
 - (IBAction)switchToProfile:(id)sender {
   // Check the event flags to see if a new window should be created.
   bool alwaysCreate = ui::WindowOpenDispositionFromNSEvent(
       [NSApp currentEvent]) == NEW_WINDOW;
   avatarMenu_->SwitchToProfile([sender tag], alwaysCreate,
                                ProfileMetrics::SWITCH_PROFILE_ICON);
 }
 
 - (IBAction)showUserManager:(id)sender {
-  chrome::ShowUserManager(browser_->profile()->GetPath());
+  profiles::ShowUserManagerMaybeWithTutorial(browser_->profile());
 }
 
 - (IBAction)exitGuest:(id)sender {
   DCHECK(browser_->profile()->IsGuestSession());
-  chrome::ShowUserManager(base::FilePath());
+  [self showUserManager:sender];
   profiles::CloseGuestProfileWindows();
 }
 
 - (IBAction)goIncognito:(id)sender {
   DCHECK([self shouldShowGoIncognito]);
   chrome::NewIncognitoWindow(browser_);
 }
 
 - (IBAction)showAccountManagement:(id)sender {
   [self initMenuContentsWithView:profiles::BUBBLE_VIEW_MODE_ACCOUNT_MANAGEMENT];
 }
 
 - (IBAction)hideAccountManagement:(id)sender {
   [self initMenuContentsWithView:profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER];
 }
 
 - (IBAction)lockProfile:(id)sender {
   profiles::LockProfile(browser_->profile());
   [self postActionPerformed:ProfileMetrics::PROFILE_DESKTOP_MENU_LOCK];
 }
 
 - (IBAction)showInlineSigninPage:(id)sender {
   [self initMenuContentsWithView:profiles::BUBBLE_VIEW_MODE_GAIA_SIGNIN];
 }
 
+
 - (IBAction)addAccount:(id)sender {
   [self initMenuContentsWithView:profiles::BUBBLE_VIEW_MODE_GAIA_ADD_ACCOUNT];
   [self postActionPerformed:ProfileMetrics::PROFILE_DESKTOP_MENU_ADD_ACCT];
 }
 
 - (IBAction)navigateBackFromSigninPage:(id)sender {
   std::string primaryAccount = SigninManagerFactory::GetForProfile(
       browser_->profile())->GetAuthenticatedUsername();
   bool hasAccountManagement = !primaryAccount.empty() &&
       switches::IsEnableAccountConsistency();
@@ skipping 49 matching lines @@
       SyncConfirmationUIClosed(true);
 }
 
 - (IBAction)syncSettingsConfirmed:(id)sender {
   tutorialMode_ = profiles::TUTORIAL_MODE_NONE;
   LoginUIServiceFactory::GetForProfile(browser_->profile())->
       SyncConfirmationUIClosed(false);
   [self initMenuContentsWithView:profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER];
 }
 
+- (IBAction)addPerson:(id)sender {
+  profiles::ShowUserManagerMaybeWithTutorial(browser_->profile());
+}
+
 - (IBAction)disconnectProfile:(id)sender {
   chrome::ShowSettings(browser_);
 }
 
 - (IBAction)navigateBackFromSwitchUserView:(id)sender {
   [self initMenuContentsWithView:profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER];
 }
 
 - (void)windowWillClose:(NSNotification*)notification {
   if (tutorialMode_ == profiles::TUTORIAL_MODE_CONFIRM_SIGNIN) {
@@ skipping 228 matching lines @@
                        buttonAction:@selector(syncSettingsConfirmed:)];
 }
 
 - (NSView*)buildWelcomeUpgradeTutorialViewIfNeeded {
   if (first_run::IsChromeFirstRun())
     return nil;
 
   Profile* profile = browser_->profile();
   const AvatarMenu::Item& avatarItem =
       avatarMenu_->GetItemAt(avatarMenu_->GetActiveProfileIndex());
+  if (!avatarItem.signed_in) {
+    profile->GetPrefs()->SetInteger(
+        prefs::kProfileAvatarTutorialShown, kUpgradeWelcomeTutorialShowMax + 1);
+    return nil;
+  }
 
   const int showCount = profile->GetPrefs()->GetInteger(
       prefs::kProfileAvatarTutorialShown);
   // Do not show the tutorial if user has dismissed it.
   if (showCount > kUpgradeWelcomeTutorialShowMax)
     return nil;
 
   if (tutorialMode_ != profiles::TUTORIAL_MODE_WELCOME_UPGRADE) {
     if (showCount == kUpgradeWelcomeTutorialShowMax)
       return nil;
     profile->GetPrefs()->SetInteger(
         prefs::kProfileAvatarTutorialShown, showCount + 1);
   }
 
   NSString* titleMessage = l10n_util::GetNSStringF(
       IDS_PROFILES_WELCOME_UPGRADE_TUTORIAL_TITLE, avatarItem.name);
   NSString* contentMessage = l10n_util::GetNSString(
       IDS_PROFILES_WELCOME_UPGRADE_TUTORIAL_CONTENT_TEXT);
-  // For local profiles, the "Not you" link doesn't make sense.
-  NSString* linkMessage = avatarItem.signed_in ?
-      l10n_util::GetNSStringF(IDS_PROFILES_NOT_YOU, avatarItem.name) : nil;
+  NSString* linkMessage = l10n_util::GetNSStringF(
+      IDS_PROFILES_NOT_YOU, avatarItem.name);
   NSString* buttonMessage = l10n_util::GetNSString(
       IDS_PROFILES_TUTORIAL_WHATS_NEW_BUTTON);
   return [self tutorialViewWithMode:profiles::TUTORIAL_MODE_WELCOME_UPGRADE
                        titleMessage:titleMessage
                      contentMessage:contentMessage
                         linkMessage:linkMessage
                       buttonMessage:buttonMessage
                          linkAction:@selector(showSwitchUserView:)
                        buttonAction:@selector(seeWhatsNew:)];
 }
@@ skipping 23 matching lines @@
   [tutorialOkButton setTarget:self];
   [tutorialOkButton setAction:buttonAction];
   [tutorialOkButton sizeToFit];
   NSSize buttonSize = [tutorialOkButton frame].size;
   const CGFloat kTopBottomTextPadding = 6;
   const CGFloat kLeftRightTextPadding = 15;
   buttonSize.width += 2 * kLeftRightTextPadding;
   buttonSize.height += 2 * kTopBottomTextPadding;
   [tutorialOkButton setFrameSize:buttonSize];
   [tutorialOkButton setAlignment:NSCenterTextAlignment];
-
   [tutorialOkButton setFrameOrigin:NSMakePoint(
       kFixedMenuWidth - NSWidth([tutorialOkButton frame]) - kHorizontalSpacing,
       yOffset)];
   [container addSubview:tutorialOkButton];
 
-  if (linkMessage) {
-    NSButton* learnMoreLink =
-        [self linkButtonWithTitle:linkMessage
-                      frameOrigin:NSZeroPoint
-                           action:linkAction];
-    [[learnMoreLink cell] setTextColor:[NSColor whiteColor]];
-    CGFloat linkYOffset = yOffset + (NSHeight([tutorialOkButton frame]) -
-                                     NSHeight([learnMoreLink frame])) / 2;
-    [learnMoreLink setFrameOrigin:NSMakePoint(kHorizontalSpacing, linkYOffset)];
-    [container addSubview:learnMoreLink];
-    yOffset = std::max(NSMaxY([learnMoreLink frame]),
-                       NSMaxY([tutorialOkButton frame])) + kVerticalSpacing;
-  } else {
-    yOffset = NSMaxY([tutorialOkButton frame]) + kVerticalSpacing;
-  }
+  NSButton* learnMoreLink =
+      [self linkButtonWithTitle:linkMessage
+                    frameOrigin:NSZeroPoint
+                         action:linkAction];
+  [[learnMoreLink cell] setTextColor:[NSColor whiteColor]];
+  CGFloat linkYOffset = yOffset + (NSHeight([tutorialOkButton frame]) -
+                                   NSHeight([learnMoreLink frame])) / 2;
+  [learnMoreLink setFrameOrigin:NSMakePoint(kHorizontalSpacing, linkYOffset)];
+  [container addSubview:learnMoreLink];
+
+  yOffset = std::max(NSMaxY([learnMoreLink frame]),
+                     NSMaxY([tutorialOkButton frame])) + 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 493 matching lines @@
       l10n_util::GetNSString(IDS_PROFILES_ACCOUNT_REMOVAL_TITLE),
       self /* backButtonTarget*/,
       @selector(showAccountManagement:) /* backButtonAction */);
   [container addSubview:titleView];
   yOffset = NSMaxY([titleView frame]);
 
   [container setFrameSize:NSMakeSize(kFixedAccountRemovalViewWidth, yOffset)];
   return container.autorelease();
 }
 
+
 - (NSView*)buildSwitchUserView {
   base::scoped_nsobject<NSView> container(
       [[NSView alloc] initWithFrame:NSZeroRect]);
   CGFloat availableWidth =
       kFixedSwitchUserViewWidth - 2 * kHorizontalSpacing;
   CGFloat yOffset = 0;
   NSRect viewRect = NSMakeRect(0, yOffset,
                                kFixedSwitchUserViewWidth,
                                kBlueButtonHeight + kSmallVerticalSpacing);
 
@@ skipping 15 matching lines @@
   [container addSubview:separator];
   yOffset = NSMaxY([separator frame]);
 
   // Adds "Add person" button.
   viewRect.origin.y = yOffset;
   NSButton* addPersonButton =
       [self hoverButtonWithRect:viewRect
                            text:l10n_util::GetNSString(
                                     IDS_PROFILES_ADD_PERSON_BUTTON)
                 imageResourceId:IDR_ICON_PROFILES_MENU_AVATAR
-                         action:@selector(showUserManager:)];
+                         action:@selector(addPerson:)];
   [container addSubview:addPersonButton];
   yOffset = NSMaxY([addPersonButton frame]);
 
   separator = [self horizontalSeparatorWithFrame:
       NSMakeRect(0, yOffset, kFixedMenuWidth, 0)];
   [container addSubview:separator];
   yOffset = NSMaxY([separator frame]);
 
   // Adds the content text.
   NSTextField* contentLabel = BuildLabel(
@@ skipping 141 matching lines @@
 }
 
 - (bool)shouldShowGoIncognito {
   bool incognitoAvailable =
       IncognitoModePrefs::GetAvailability(browser_->profile()->GetPrefs()) !=
           IncognitoModePrefs::DISABLED;
   return incognitoAvailable && !browser_->profile()->IsGuestSession();
 }
 
 @end