[Mac] Redesign the avatar bubble UI

chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.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/profile_chooser_controller.h"
 
 #include "base/command_line.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 57 matching lines @@
   void StartProfileChooserController() {
     NSRect frame = [test_window() frame];
     NSPoint point = NSMakePoint(NSMidX(frame), NSMidY(frame));
     controller_.reset([[ProfileChooserController alloc]
         initWithBrowser:browser()
              anchoredAt:point
                withMode:BUBBLE_VIEW_MODE_PROFILE_CHOOSER]);
     [controller_ showWindow:nil];
   }
 
+  void EnableNewProfileManagement() {
+    CommandLine::ForCurrentProcess()->AppendSwitch(
+        switches::kNewProfileManagement);
+  }
+
+  void EnableNewAvatarMenuOnly() {
+    CommandLine::ForCurrentProcess()->AppendSwitch(switches::kNewAvatarMenu);
+  }
+
+  void EnableFastUserSwitching() {
+    CommandLine::ForCurrentProcess()->AppendSwitch(
+        switches::kFastUserSwitching);
+  }
+
   ProfileChooserController* controller() { return controller_; }
   AvatarMenu* menu() { return menu_; }
 
  private:
   base::scoped_nsobject<ProfileChooserController> controller_;
 
   // Weak; owned by |controller_|.
   AvatarMenu* menu_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileChooserControllerTest);
 };
 
-TEST_F(ProfileChooserControllerTest, InitialLayout) {
+TEST_F(ProfileChooserControllerTest, InitialLayoutWithNewManagement) {
+  EnableNewProfileManagement();
   StartProfileChooserController();
+
   NSArray* subviews = [[[controller() window] contentView] subviews];
 
   // Three profiles means we should have one active card, one separator and
   // one option buttons view.
   EXPECT_EQ(3U, [subviews count]);
 
   // For a local profile, there should be one button in the option buttons view.
   NSArray* buttonSubviews = [[subviews objectAtIndex:0] subviews];
   EXPECT_EQ(1U, [buttonSubviews count]);
   NSButton* button = static_cast<NSButton*>([buttonSubviews objectAtIndex:0]);
   EXPECT_EQ(@selector(showUserManager:), [button action]);
   EXPECT_EQ(controller(), [button target]);
 
   // There should be a separator.
   EXPECT_TRUE([[subviews objectAtIndex:1] isKindOfClass:[NSBox class]]);
 
   // There should be the profile avatar, name and links container in the active
   // card view. The links displayed in the container are checked separately.
   NSArray* activeCardSubviews = [[subviews objectAtIndex:2] subviews];
   EXPECT_EQ(3U, [activeCardSubviews count]);
 
-  NSView* activeProfileImage = [activeCardSubviews objectAtIndex:0];
+  // Profile icon.
+  NSView* activeProfileImage = [activeCardSubviews objectAtIndex:2];
   EXPECT_TRUE([activeProfileImage isKindOfClass:[NSImageView class]]);
 
-  // There are some links in between. The profile name is added last.
-  CGFloat index = [activeCardSubviews count] - 1;
-  NSView* activeProfileName = [activeCardSubviews objectAtIndex:index];
+  // Profile name.
+  NSView* activeProfileName = [activeCardSubviews objectAtIndex:1];
   EXPECT_TRUE([activeProfileName isKindOfClass:[NSButton class]]);
   EXPECT_EQ(menu()->GetItemAt(0).name, base::SysNSStringToUTF16(
       [static_cast<NSButton*>(activeProfileName) title]));
+
+  // Profile links. This is a local profile, so there should be a signin button.
+  NSArray* linksSubviews = [[activeCardSubviews objectAtIndex:0] subviews];
+  EXPECT_EQ(1U, [linksSubviews count]);
+  NSButton* link = static_cast<NSButton*>([linksSubviews objectAtIndex:0]);
+  EXPECT_EQ(@selector(showInlineSigninPage:), [link action]);
+  EXPECT_EQ(controller(), [link target]);
+}
+
+TEST_F(ProfileChooserControllerTest, InitialLayoutWithNewMenu) {
+  EnableNewAvatarMenuOnly();
+  StartProfileChooserController();
+
+  NSArray* subviews = [[[controller() window] contentView] subviews];
+
+  // Three profiles means we should have one active card and a
+  // fast user switcher which has two "other" profiles and 2 separators.
+  EXPECT_EQ(5U, [subviews count]);
+
+  // There should be two "other profiles" items. The items are drawn from the
+  // bottom up, so in the opposite order of those in the AvatarMenu.
+  int profileIndex = 1;
+  for (int i = 3; i >= 0; i -= 2) {
+    // Each profile button has a separator.
+    EXPECT_TRUE([[subviews objectAtIndex:i] isKindOfClass:[NSBox class]]);
+
+    NSButton* button = static_cast<NSButton*>([subviews objectAtIndex:i-1]);
+    EXPECT_EQ(menu()->GetItemAt(profileIndex).name,
+              base::SysNSStringToUTF16([button title]));
+    EXPECT_EQ(profileIndex, [button tag]);
+    EXPECT_EQ(@selector(switchToProfile:), [button action]);
+    EXPECT_EQ(controller(), [button target]);
+    profileIndex++;
+  }
+
+  // There should be the profile avatar, name and links container in the active
+  // card view. The links displayed in the container are checked separately.
+  NSArray* activeCardSubviews = [[subviews objectAtIndex:4] subviews];
+  EXPECT_EQ(3U, [activeCardSubviews count]);
+
+  // Profile icon.
+  NSView* activeProfileImage = [activeCardSubviews objectAtIndex:2];
+  EXPECT_TRUE([activeProfileImage isKindOfClass:[NSImageView class]]);
+
+  // Profile name.
+  NSView* activeProfileName = [activeCardSubviews objectAtIndex:1];
+  EXPECT_TRUE([activeProfileName isKindOfClass:[NSButton class]]);
+  EXPECT_EQ(menu()->GetItemAt(0).name, base::SysNSStringToUTF16(
+      [static_cast<NSButton*>(activeProfileName) title]));
+
+  // Profile links. This is a local profile, so there should be a signin button.
+  NSArray* linksSubviews = [[activeCardSubviews objectAtIndex:0] subviews];
+  EXPECT_EQ(1U, [linksSubviews count]);
+  NSButton* link = static_cast<NSButton*>([linksSubviews objectAtIndex:0]);
+  EXPECT_EQ(@selector(showTabbedSigninPage:), [link action]);
+  EXPECT_EQ(controller(), [link target]);
 }
 
 TEST_F(ProfileChooserControllerTest, InitialLayoutWithFastUserSwitcher) {
-  // The fast user switcher is only availbale behind a flag.
-  CommandLine::ForCurrentProcess()->AppendSwitch(switches::kFastUserSwitching);
+  EnableNewProfileManagement();
+  EnableFastUserSwitching();
+  StartProfileChooserController();
 
-  StartProfileChooserController();
   NSArray* subviews = [[[controller() window] contentView] subviews];
 
   // Three profiles means we should have one active card, two "other" profiles,
-  // one separator and one option buttons view.
-  EXPECT_EQ(5U, [subviews count]);
+  // each with a separator, and one option buttons view.
+  EXPECT_EQ(7U, [subviews count]);
 
   // For a local profile, there should be one button in the option buttons view.
   NSArray* buttonSubviews = [[subviews objectAtIndex:0] subviews];
   EXPECT_EQ(1U, [buttonSubviews count]);
   NSButton* button = static_cast<NSButton*>([buttonSubviews objectAtIndex:0]);
   EXPECT_EQ(@selector(showUserManager:), [button action]);
   EXPECT_EQ(controller(), [button target]);
 
   // There should be a separator.
   EXPECT_TRUE([[subviews objectAtIndex:1] isKindOfClass:[NSBox class]]);
 
   // There should be two "other profiles" items. The items are drawn from the
   // bottom up, so in the opposite order of those in the AvatarMenu.
   int profileIndex = 1;
-  for (NSUInteger i = 3; i >= 2; --i) {
-    NSButton* button = static_cast<NSButton*>([subviews objectAtIndex:i]);
+  for (int i = 5; i >= 2; i -= 2) {
+    // Each profile button has a separator.
+    EXPECT_TRUE([[subviews objectAtIndex:i] isKindOfClass:[NSBox class]]);
+
+    NSButton* button = static_cast<NSButton*>([subviews objectAtIndex:i-1]);
     EXPECT_EQ(menu()->GetItemAt(profileIndex).name,
               base::SysNSStringToUTF16([button title]));
     EXPECT_EQ(profileIndex, [button tag]);
     EXPECT_EQ(@selector(switchToProfile:), [button action]);
     EXPECT_EQ(controller(), [button target]);
     profileIndex++;
   }
 
   // There should be the profile avatar, name and links container in the active
-  // card view. The links displayed in the container are checked separately.
-  NSArray* activeCardSubviews = [[subviews objectAtIndex:4] subviews];
+  // card view. These have been checked separately.
+  NSArray* activeCardSubviews = [[subviews objectAtIndex:6] subviews];
   EXPECT_EQ(3U, [activeCardSubviews count]);
-
-  NSView* activeProfileImage = [activeCardSubviews objectAtIndex:0];
-  EXPECT_TRUE([activeProfileImage isKindOfClass:[NSImageView class]]);
-
-  // There are some links in between. The profile name is added last.
-  CGFloat index = [activeCardSubviews count] - 1;
-  NSView* activeProfileName = [activeCardSubviews objectAtIndex:index];
-  EXPECT_TRUE([activeProfileName isKindOfClass:[NSButton class]]);
-  EXPECT_EQ(menu()->GetItemAt(0).name, base::SysNSStringToUTF16(
-      [static_cast<NSButton*>(activeProfileName) title]));
 }
 
 TEST_F(ProfileChooserControllerTest, OtherProfilesSortedAlphabetically) {
-  // The fast user switcher is only availbale behind a flag.
-  CommandLine::ForCurrentProcess()->AppendSwitch(switches::kFastUserSwitching);
+  EnableNewAvatarMenuOnly();
 
   // Add two extra profiles, to make sure sorting is alphabetical and not
   // by order of creation.
   testing_profile_manager()->
       CreateTestingProfile("test3", scoped_ptr<PrefServiceSyncable>(),
                            base::ASCIIToUTF16("New Profile"), 1, std::string(),
                            TestingProfile::TestingFactories());
   testing_profile_manager()->
       CreateTestingProfile("test4", scoped_ptr<PrefServiceSyncable>(),
                            base::ASCIIToUTF16("Another Test"), 1, std::string(),
                            TestingProfile::TestingFactories());
   StartProfileChooserController();
 
   NSArray* subviews = [[[controller() window] contentView] subviews];
   NSString* sortedNames[] = { @"Another Test",
                               @"New Profile",
                               @"Test 1",
                               @"Test 2" };
-  // There should be three "other profiles" items, sorted alphabetically.
-  // The "other profiles" start at index 2, after the option buttons and
-  // a separator. We need to iterate through the profiles in the order
-  // displayed in the bubble, which is opposite from the drawn order.
+  EXPECT_EQ(9U, [subviews count]);
+  // There should be four "other profiles" items, sorted alphabetically.
+  // The "other profiles" start at index 0, and each have a separator. We
+  // need to iterate through the profiles in the order displayed in the bubble,
+  // which is opposite from the drawn order.
   int sortedNameIndex = 0;
-  for (NSUInteger i = 5; i >= 2; --i) {
-    NSButton* button = static_cast<NSButton*>([subviews objectAtIndex:i]);
+  for (int i = 7; i >= 0; i -= 2) {
+    // The item at index i is the separator.
+    NSButton* button = static_cast<NSButton*>([subviews objectAtIndex:i-1]);
     EXPECT_TRUE(
         [[button title] isEqualToString:sortedNames[sortedNameIndex++]]);
   }
 }
 
-TEST_F(ProfileChooserControllerTest, LocalProfileActiveCardLinks) {
+TEST_F(ProfileChooserControllerTest,
+    LocalProfileActiveCardLinksWithNewManagement) {
+  EnableNewProfileManagement();
   StartProfileChooserController();
   NSArray* subviews = [[[controller() window] contentView] subviews];
   NSArray* activeCardSubviews = [[subviews objectAtIndex:2] subviews];
-  NSArray* activeCardLinks = [[activeCardSubviews objectAtIndex:1] subviews];
+  NSArray* activeCardLinks = [[activeCardSubviews objectAtIndex:0] subviews];
 
   // There should be one "sign in" link.
   EXPECT_EQ(1U, [activeCardLinks count]);
   NSButton* signinLink =
       static_cast<NSButton*>([activeCardLinks objectAtIndex:0]);
-  EXPECT_EQ(@selector(showSigninPage:), [signinLink action]);
+  EXPECT_EQ(@selector(showInlineSigninPage:), [signinLink action]);
   EXPECT_EQ(controller(), [signinLink target]);
 }
 
-TEST_F(ProfileChooserControllerTest, SignedInProfileActiveCardLinks) {
+TEST_F(ProfileChooserControllerTest,
+    LocalProfileActiveCardLinksWithNewMenu) {
+  EnableNewAvatarMenuOnly();
+  StartProfileChooserController();
+  NSArray* subviews = [[[controller() window] contentView] subviews];
+  NSArray* activeCardSubviews = [[subviews objectAtIndex:4] subviews];
+  NSArray* activeCardLinks = [[activeCardSubviews objectAtIndex:0] subviews];
+
+  // There should be one "sign in" link.
+  EXPECT_EQ(1U, [activeCardLinks count]);
+  NSButton* signinLink =
+      static_cast<NSButton*>([activeCardLinks objectAtIndex:0]);
+  EXPECT_EQ(@selector(showTabbedSigninPage:), [signinLink action]);
+  EXPECT_EQ(controller(), [signinLink target]);
+}
+
+TEST_F(ProfileChooserControllerTest,
+    SignedInProfileActiveCardLinksWithNewManagement) {
+  EnableNewProfileManagement();
   // Sign in the first profile.
   ProfileInfoCache* cache = testing_profile_manager()->profile_info_cache();
   cache->SetUserNameOfProfileAtIndex(0, base::ASCIIToUTF16(kEmail));
 
   StartProfileChooserController();
   NSArray* subviews = [[[controller() window] contentView] subviews];
   NSArray* activeCardSubviews = [[subviews objectAtIndex:2] subviews];
-  NSArray* activeCardLinks = [[activeCardSubviews objectAtIndex:1] subviews];
+  NSArray* activeCardLinks = [[activeCardSubviews objectAtIndex:0] subviews];
 
   // There is one link: manage accounts.
   EXPECT_EQ(1U, [activeCardLinks count]);
   NSButton* manageAccountsLink =
       static_cast<NSButton*>([activeCardLinks objectAtIndex:0]);
   EXPECT_EQ(@selector(showAccountManagement:), [manageAccountsLink action]);
   EXPECT_EQ(controller(), [manageAccountsLink target]);
 }
 
-TEST_F(ProfileChooserControllerTest, AccountManagementLayout) {
+TEST_F(ProfileChooserControllerTest,
+    SignedInProfileActiveCardLinksWithNewMenu) {
+  EnableNewAvatarMenuOnly();
   // Sign in the first profile.
   ProfileInfoCache* cache = testing_profile_manager()->profile_info_cache();
   cache->SetUserNameOfProfileAtIndex(0, base::ASCIIToUTF16(kEmail));
+
+  StartProfileChooserController();
+  NSArray* subviews = [[[controller() window] contentView] subviews];
+  NSArray* activeCardSubviews = [[subviews objectAtIndex:4] subviews];
+  NSArray* activeCardLinks = [[activeCardSubviews objectAtIndex:0] subviews];
+
+  // There is one link, without a target and with the user's email.
+  EXPECT_EQ(1U, [activeCardLinks count]);
+  NSButton* emailLink =
+      static_cast<NSButton*>([activeCardLinks objectAtIndex:0]);
+  EXPECT_EQ(nil, [emailLink action]);
+  EXPECT_EQ(kEmail, base::SysNSStringToUTF8([emailLink title]));
+  EXPECT_EQ(controller(), [emailLink target]);
+}
+
+TEST_F(ProfileChooserControllerTest, AccountManagementLayout) {
+  EnableNewProfileManagement();
+  // Sign in the first profile.
+  ProfileInfoCache* cache = testing_profile_manager()->profile_info_cache();
+  cache->SetUserNameOfProfileAtIndex(0, base::ASCIIToUTF16(kEmail));
 
   // Set up the signin manager and the OAuth2Tokens.
   Profile* profile = browser()->profile();
   SigninManagerFactory::GetForProfile(profile)->
       SetAuthenticatedUsername(kEmail);
   ProfileOAuth2TokenServiceFactory::GetForProfile(profile)->
       UpdateCredentials(kEmail, kLoginToken);
   ProfileOAuth2TokenServiceFactory::GetForProfile(profile)->
       UpdateCredentials(kSecondaryEmail, kLoginToken);
 
@@ skipping 31 matching lines @@
   EXPECT_EQ(controller(), [addAccountsButton target]);
 
   // There should be two accounts in the account list container.
   NSArray* accountsListSubviews = [[accountsSubviews objectAtIndex:1] subviews];
   EXPECT_EQ(2U, [accountsListSubviews count]);
 
   NSButton* genericAccount =
       static_cast<NSButton*>([accountsListSubviews objectAtIndex:0]);
   EXPECT_EQ(@selector(showAccountRemovalView:), [genericAccount action]);
   EXPECT_EQ(controller(), [genericAccount target]);
+  EXPECT_NE(-1, [genericAccount tag]);
 
   // Primary accounts are always last.
   NSButton* primaryAccount =
       static_cast<NSButton*>([accountsListSubviews objectAtIndex:1]);
   EXPECT_EQ(@selector(showAccountRemovalView:), [primaryAccount action]);
   EXPECT_EQ(controller(), [primaryAccount target]);
+  EXPECT_EQ(-1, [primaryAccount tag]);
 
   // There should be another separator.
   EXPECT_TRUE([[subviews objectAtIndex:3] isKindOfClass:[NSBox class]]);
 
-  // There should be the profile avatar, name and no links container in the
-  // active card view.
+  // There should be the profile avatar, name and a "hide accounts" link
+  // container in the active card view.
   NSArray* activeCardSubviews = [[subviews objectAtIndex:4] subviews];
-  EXPECT_EQ(2U, [activeCardSubviews count]);
+  EXPECT_EQ(3U, [activeCardSubviews count]);
 
-  NSView* activeProfileImage = [activeCardSubviews objectAtIndex:0];
+  // Profile icon.
+  NSView* activeProfileImage = [activeCardSubviews objectAtIndex:2];
   EXPECT_TRUE([activeProfileImage isKindOfClass:[NSImageView class]]);
 
+  // Profile name.
   NSView* activeProfileName = [activeCardSubviews objectAtIndex:1];
   EXPECT_TRUE([activeProfileName isKindOfClass:[NSButton class]]);
   EXPECT_EQ(menu()->GetItemAt(0).name, base::SysNSStringToUTF16(
       [static_cast<NSButton*>(activeProfileName) title]));
+
+  // Profile links. This is a local profile, so there should be a signin button.
+  NSArray* linksSubviews = [[activeCardSubviews objectAtIndex:0] subviews];
+  EXPECT_EQ(1U, [linksSubviews count]);
+  NSButton* link = static_cast<NSButton*>([linksSubviews objectAtIndex:0]);
+  EXPECT_EQ(@selector(hideAccountManagement:), [link action]);
+  EXPECT_EQ(controller(), [link target]);
 }