[Mac, Win] Only show the user manager tutorial if "See what's new" is clicked.

[Mac, Win] Only show the user manager tutorial if "See what's new" is clicked.

- remove the profile preference that used to keep track of showing the
tutorial any time the user manager was shown for a particular profile.

- show the upgrade bubble for local profiles as well (so that local profiles
have a chance to see the tutorial)

- for the local profiles upgrade bubble, don't show the "Not you?" link as
it doesn't really make sense.

BUG=399679
TBR=rpetterson@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=288817

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=289005

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=289636

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=290021

[guohui, 2014-08-11 17:08:15]

lgtm

[noms (inactive), 2014-08-11 18:18:12]

Hi all,

This CL changes when we are showing the new user manager tutorial to users.
Please take a look.

Rachel: chrome/browser/profiles/*
Scott: chrome/browser/ui/views/*
Alexei: chrome/browser/ui/cocoa/*

Thanks!

[Alexei Svitkine (slow), 2014-08-11 18:58:56]

cocoa lgtm

[sky, 2014-08-11 20:08:01]

LGTM

[noms (inactive), 2014-08-11 21:13:25]

I'm going to TBR Rachel, since I own those files and the changes are super
minor.

[noms (inactive), 2014-08-11 21:13:30]

The CQ bit was checked by noms@chromium.org

[commit-bot: I haz the power, 2014-08-11 21:15:43]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/noms@chromium.org/454153002/60001

[rpetterson, 2014-08-11 22:14:34]

Sorry for the delay, but, yeah, profiles LGTM

[commit-bot: I haz the power, 2014-08-11 22:22:15]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  mac_chromium_rel_swarming on tryserver.chromium.mac
(http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_rel_...)

[commit-bot: I haz the power, 2014-08-11 22:57:45]

Change committed as 288817

[noms (inactive), 2014-08-12 01:18:16]

Reopened, as this got reverted in
https://codereview.chromium.org/464673002/

[noms (inactive), 2014-08-12 15:38:10]

All the mac bots are green, and ran the ProfileChooserTest unit tests that had
failed on the waterfall, so giving this another try...

On 2014/08/12 01:18:16, Monica Dinculescu wrote:
> Reopened, as this got reverted in
> https://codereview.chromium.org/464673002/

[noms (inactive), 2014-08-12 15:38:19]

The CQ bit was checked by noms@chromium.org

[commit-bot: I haz the power, 2014-08-12 15:39:17]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/noms@chromium.org/454153002/80001

[commit-bot: I haz the power, 2014-08-12 17:04:44]

Change committed as 289005

[noms (inactive), 2014-08-12 17:42:51]

A revert of this CL has been created in
https://codereview.chromium.org/461093002/ by noms@chromium.org.

The reason for reverting is: Breaks
ProfileChooserControllerTest.InitialLayoutWithFastUserSwitcher,ProfileChooserControllerTest.InitialLayoutWithNewMenu,ProfileChooserControllerTest.OtherProfilesSortedAlphabetically
on the waterfall..

[noms (inactive), 2014-08-13 16:42:46]

The CQ bit was checked by noms@chromium.org

[commit-bot: I haz the power, 2014-08-13 16:43:49]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/noms@chromium.org/454153002/140001

[commit-bot: I haz the power, 2014-08-13 20:16:22]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  linux_gpu_triggered_tests on tryserver.chromium.gpu
(http://build.chromium.org/p/tryserver.chromium.gpu/builders/linux_gpu_trigger...)
  android_aosp on tryserver.chromium.linux
(http://build.chromium.org/p/tryserver.chromium.linux/builders/android_aosp/bu...)
  android_dbg on tryserver.chromium.linux
(http://build.chromium.org/p/tryserver.chromium.linux/builders/android_dbg/bui...)

[commit-bot: I haz the power, 2014-08-14 11:25:12]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-08-14 11:25:13]

Try jobs failed on following builders:
  android_aosp on tryserver.chromium.linux
(http://build.chromium.org/p/tryserver.chromium.linux/builders/android_aosp/bu...)

[noms (inactive), 2014-08-14 13:33:17]

The CQ bit was checked by noms@chromium.org

[commit-bot: I haz the power, 2014-08-14 13:35:28]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/noms@chromium.org/454153002/140001

[commit-bot: I haz the power, 2014-08-14 17:36:22]

Committed patchset #7 (140001) as 289636

[noms (inactive), 2014-08-15 14:38:06]

Reopening this because apparently the last rebase nuked everything. WAT.

[noms (inactive), 2014-08-15 16:45:48]

The CQ bit was checked by noms@chromium.org

[commit-bot: I haz the power, 2014-08-15 16:47:36]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/noms@chromium.org/454153002/180001

[commit-bot: I haz the power, 2014-08-15 18:14:29]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-08-15 18:14:30]

Failed to apply patch for
chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm
  Hunk #3 FAILED at 916.
  Hunk #4 succeeded at 1182 (offset 17 lines).
  Hunk #5 succeeded at 1203 (offset 20 lines).
  Hunk #6 succeeded at 1249 (offset 20 lines).
  Hunk #7 succeeded at 1776 with fuzz 2 (offset 20 lines).
  Hunk #8 succeeded at 1813 (offset 22 lines).
  1 out of 8 hunks FAILED -- saving rejects to file
chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm.rej

Patch:       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
b94e3f46d6005b34f086516cd492b84fc4068ae1..0de1600f0ef4e7a0286c00d6c2b71e2b2b8e452c
100644
--- a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm
+++ b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm
@@ -814,14 +814,14 @@ class ActiveProfileObserverBridge : public
AvatarMenuObserver,
 }
 
 - (IBAction)showUserManager:(id)sender {
-  profiles::ShowUserManagerMaybeWithTutorial(browser_->profile());
+  chrome::ShowUserManager(browser_->profile()->GetPath());
   [self postActionPerformed:
       ProfileMetrics::PROFILE_DESKTOP_MENU_OPEN_USER_MANAGER];
 }
 
 - (IBAction)exitGuest:(id)sender {
   DCHECK(browser_->profile()->IsGuestSession());
-  [self showUserManager:sender];
+  chrome::ShowUserManager(base::FilePath());
   profiles::CloseGuestProfileWindows();
 }
 
@@ -847,7 +847,6 @@ class ActiveProfileObserverBridge : public
AvatarMenuObserver,
   [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];
@@ -917,10 +916,6 @@ class ActiveProfileObserverBridge : public
AvatarMenuObserver,
   [self initMenuContentsWithView:profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER];
 }
 
-- (IBAction)addPerson:(id)sender {
-  profiles::ShowUserManagerMaybeWithTutorial(browser_->profile());
-}
-
 - (IBAction)disconnectProfile:(id)sender {
   chrome::ShowSettings(browser_);
 }
@@ -1166,12 +1161,6 @@ class ActiveProfileObserverBridge : public
AvatarMenuObserver,
   Profile* profile = browser_->profile();
   const AvatarMenu::Item& avatarItem =
       avatarMenu_->GetItemAt(avatarMenu_->GetActiveProfileIndex());
-  if (!avatarItem.signed_in) {
-    profile->GetPrefs()->SetInteger(
-        prefs::kProfileAvatarTutorialShown,
-        signin_ui_util::kUpgradeWelcomeTutorialShowMax + 1);
-    return nil;
-  }
 
   const int showCount = profile->GetPrefs()->GetInteger(
       prefs::kProfileAvatarTutorialShown);
@@ -1190,8 +1179,9 @@ class ActiveProfileObserverBridge : public
AvatarMenuObserver,
       IDS_PROFILES_WELCOME_UPGRADE_TUTORIAL_TITLE);
   NSString* contentMessage = l10n_util::GetNSString(
       IDS_PROFILES_WELCOME_UPGRADE_TUTORIAL_CONTENT_TEXT);
-  NSString* linkMessage = l10n_util::GetNSStringF(
-      IDS_PROFILES_NOT_YOU, avatarItem.name);
+  // 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* buttonMessage = l10n_util::GetNSString(
       IDS_PROFILES_TUTORIAL_WHATS_NEW_BUTTON);
   return [self tutorialViewWithMode:profiles::TUTORIAL_MODE_WELCOME_UPGRADE
@@ -1235,24 +1225,27 @@ class ActiveProfileObserverBridge : public
AvatarMenuObserver,
   buttonSize.height += 2 * kTopBottomTextPadding;
   [tutorialOkButton setFrameSize:buttonSize];
   [tutorialOkButton setAlignment:NSCenterTextAlignment];
+
   [tutorialOkButton setFrameOrigin:NSMakePoint(
       kFixedMenuWidth - NSWidth([tutorialOkButton frame]) - kHorizontalSpacing,
       yOffset)];
   [container addSubview:tutorialOkButton];
 
-  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;
-
+  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;
+  }
   // Adds body content.
   NSTextField* contentLabel = BuildLabel(
       contentMessage,
@@ -1759,7 +1752,6 @@ class ActiveProfileObserverBridge : public
AvatarMenuObserver,
   return container.autorelease();
 }
 
-
 - (NSView*)buildSwitchUserView {
   base::scoped_nsobject<NSView> container(
       [[NSView alloc] initWithFrame:NSZeroRect]);
@@ -1795,7 +1787,7 @@ class ActiveProfileObserverBridge : public
AvatarMenuObserver,
                            text:l10n_util::GetNSString(
                                     IDS_PROFILES_ADD_PERSON_BUTTON)
                 imageResourceId:IDR_ICON_PROFILES_MENU_AVATAR
-                         action:@selector(addPerson:)];
+                         action:@selector(showUserManager:)];
   [container addSubview:addPersonButton];
   yOffset = NSMaxY([addPersonButton frame]);

[noms (inactive), 2014-08-15 18:25:09]

The CQ bit was checked by noms@chromium.org

[commit-bot: I haz the power, 2014-08-15 18:27:29]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/noms@chromium.org/454153002/200001

[commit-bot: I haz the power, 2014-08-15 21:48:50]

Committed patchset #9 (200001) as 290021