[Mac] Allow "Enter" to activate the buttons in 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 <Carbon/Carbon.h>  // kVK_Return
 
 #import "chrome/browser/ui/cocoa/profiles/profile_chooser_controller.h"
 
 #include "base/mac/bundle_locations.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 772 matching lines @@
   NSColor* backgroundColor = isHighlighted ? hoverColor_ : backgroundColor_;
   [[self cell] setBackgroundColor:backgroundColor];
 }
 
 - (BOOL)canBecomeKeyView {
   return YES;
 }
 
 @end
 
+// Wrapper for a BackgroundColorHoverButton so that the button can be activated
+// on enter, to match the behaviour on Windows.
+@interface BackgroundColorHoverButtonContainer : NSView {

[groby-ooo-7-16, 2015/02/02 21:57:33]

Why not just subclass BackgroundColorHoverButton, and only override keyDown?
Saves us from adding more views to the hierarchy.

[noms (inactive), 2015/02/02 23:01:05]

Ah, duh. I misunderstood my old CL when I tried to do this (but that used
performKeyEquivalent)
Don't even need to subclass it, all these buttons should respond to enter.

+@private
+  NSButton* button_;
+}
+
+- (id)initWithFrame:(NSRect)frame
+             button:(NSButton*)button;
+@end
+
+@implementation BackgroundColorHoverButtonContainer
+- (id)initWithFrame:(NSRect)frame
+             button:(NSButton*)button {
+  if ((self = [super initWithFrame:frame])) {
+    button_ = button;
+    [self addSubview:button_];
+  }
+  return self;
+}
+
+-(void)keyDown:(NSEvent*)event {
+  // On enter, activate the wrapped button.

[groby-ooo-7-16, 2015/02/02 21:57:33]

Do we care about the state of modifier keys? Menus don't, so this is correct -
but I wanted to make sure it's intentional :)

[noms (inactive), 2015/02/02 23:01:05]

I don't think we do, nope.

+  if ([event keyCode] == kVK_Return)
+    [button_ performClick:self];
+  else
+    [super keyDown:event];
+}
+
+@end
+
 // A custom view with the given background color.
 @interface BackgroundColorView : NSView {
  @private
   base::scoped_nsobject<NSColor> backgroundColor_;
 }
 @end
 
 @implementation BackgroundColorView
 - (id)initWithFrame:(NSRect)frameRect
           withColor:(NSColor*)color {
@@ skipping 72 matching lines @@
 
 // Creates the disclaimer text for supervised users, telling them that the
 // manager can view their history etc.
 - (NSView*)createSupervisedUserDisclaimerView;
 
 // Creates a main profile card for the guest user.
 - (NSView*)createGuestProfileView;
 
 // Creates an item for the profile |itemIndex| that is used in the fast profile
 // switcher in the middle of the bubble.
-- (NSButton*)createOtherProfileView:(int)itemIndex;
+- (NSView*)createOtherProfileView:(int)itemIndex;
 
 // Creates the "Not you" and Lock option buttons.
 - (NSView*)createOptionsViewWithRect:(NSRect)rect
                          displayLock:(BOOL)displayLock;
 
 // Creates the account management view for the active profile.
 - (NSView*)createCurrentProfileAccountsView:(NSRect)rect;
 
 // Creates the list of accounts for the active profile.
 - (NSView*)createAccountsListWithRect:(NSRect)rect;
 
 // Creates the Gaia sign-in/add account view.
 - (NSView*)buildGaiaEmbeddedView;
 
 // Creates the account removal view.
 - (NSView*)buildAccountRemovalView;
 
 // Create a view that shows various options for an upgrade user who is not
 // the same person as the currently signed in user.
 - (NSView*)buildSwitchUserView;
 
 // Creates a button with |text|, an icon given by |imageResourceId| and with
 // |action|.
-- (NSButton*)hoverButtonWithRect:(NSRect)rect
-                            text:(NSString*)text
-                 imageResourceId:(int)imageResourceId
-                          action:(SEL)action;
+- (NSView*)hoverButtonWithRect:(NSRect)rect
+                          text:(NSString*)text
+               imageResourceId:(int)imageResourceId
+                        action:(SEL)action;
 
 // Creates a generic link button with |title| and an |action| positioned at
 // |frameOrigin|.
 - (NSButton*)linkButtonWithTitle:(NSString*)title
                      frameOrigin:(NSPoint)frameOrigin
                           action:(SEL)action;
 
 // Creates an email account button with |title| and a remove icon. If
 // |reauthRequired| is true, the button also displays a warning icon. |tag|
 // indicates which account the button refers to.
@@ skipping 825 matching lines @@
   AvatarMenu::Item guestItem(std::string::npos, /* menu_index, not used */
                              std::string::npos, /* profile_index, not used */
                              guestIcon);
   guestItem.active = true;
   guestItem.name = base::SysNSStringToUTF16(
       l10n_util::GetNSString(IDS_PROFILES_GUEST_PROFILE_NAME));
 
   return [self createCurrentProfileView:guestItem];
 }
 
-- (NSButton*)createOtherProfileView:(int)itemIndex {
+- (NSView*)createOtherProfileView:(int)itemIndex {
   const AvatarMenu::Item& item = avatarMenu_->GetItemAt(itemIndex);
 
   NSRect rect = NSMakeRect(
       0, 0, kFixedMenuWidth, kBlueButtonHeight + kSmallVerticalSpacing);
   base::scoped_nsobject<BackgroundColorHoverButton> profileButton(
       [[BackgroundColorHoverButton alloc]
-          initWithFrame:rect
+          initWithFrame:NSMakeRect(0, 0, rect.size.width, rect.size.height)
       imageTitleSpacing:kImageTitleSpacing
         backgroundColor:GetDialogBackgroundColor()]);
   [profileButton setTitle:base::SysUTF16ToNSString(item.name)];
   [profileButton setDefaultImage:CreateProfileImage(
       item.icon, kSmallImageSide).ToNSImage()];
   [profileButton setImagePosition:NSImageLeft];
   [profileButton setAlignment:NSLeftTextAlignment];
   [profileButton setBordered:NO];
   [profileButton setTag:itemIndex];
   [profileButton setTarget:self];
   [profileButton setAction:@selector(switchToProfile:)];
 
-  return profileButton.autorelease();
+  base::scoped_nsobject<BackgroundColorHoverButtonContainer> container(
+      [[BackgroundColorHoverButtonContainer alloc]
+          initWithFrame:rect
+                 button:profileButton]);
+  return container.autorelease();
 }
 
 - (NSView*)createOptionsViewWithRect:(NSRect)rect
                          displayLock:(BOOL)displayLock {
   NSRect viewRect = NSMakeRect(0, 0,
                                rect.size.width,
                                kBlueButtonHeight + kSmallVerticalSpacing);
   base::scoped_nsobject<NSView> container([[NSView alloc] initWithFrame:rect]);
 
   if (displayLock) {
-    NSButton* lockButton =
+    NSView* lockButton =
         [self hoverButtonWithRect:viewRect
                              text:l10n_util::GetNSString(
                                   IDS_PROFILES_PROFILE_SIGNOUT_BUTTON)
                   imageResourceId:IDR_ICON_PROFILES_MENU_LOCK
                            action:@selector(lockProfile:)];
     [container addSubview:lockButton];
     viewRect.origin.y = NSMaxY([lockButton frame]);
 
     NSBox* separator = [self horizontalSeparatorWithFrame:viewRect];
     [container addSubview:separator];
     viewRect.origin.y = NSMaxY([separator frame]);
   }
 
   if ([self shouldShowGoIncognito]) {
-    NSButton* goIncognitoButton =
+    NSView* goIncognitoButton =
         [self hoverButtonWithRect:viewRect
                              text:l10n_util::GetNSString(
                                   IDS_PROFILES_GO_INCOGNITO_BUTTON)
                   imageResourceId:IDR_ICON_PROFILES_MENU_INCOGNITO
                            action:@selector(goIncognito:)];
     viewRect.origin.y = NSMaxY([goIncognitoButton frame]);
     [container addSubview:goIncognitoButton];
 
     NSBox* separator = [self horizontalSeparatorWithFrame:viewRect];
     [container addSubview:separator];
     viewRect.origin.y = NSMaxY([separator frame]);
   }
 
   NSString* text = isGuestSession_ ?
       l10n_util::GetNSString(IDS_PROFILES_EXIT_GUEST) :
       l10n_util::GetNSString(IDS_PROFILES_SWITCH_USERS_BUTTON);
-  NSButton* switchUsersButton =
+  NSView* switchUsersButton =
       [self hoverButtonWithRect:viewRect
                            text:text
                 imageResourceId:IDR_ICON_PROFILES_MENU_AVATAR
                          action:isGuestSession_? @selector(exitGuest:) :
                                                  @selector(showUserManager:)];
   viewRect.origin.y = NSMaxY([switchUsersButton frame]);
   [container addSubview:switchUsersButton];
 
   [container setFrameSize:NSMakeSize(rect.size.width, viewRect.origin.y)];
   return container.autorelease();
@@ skipping 234 matching lines @@
       kFixedSwitchUserViewWidth - 2 * kHorizontalSpacing;
   CGFloat yOffset = 0;
   NSRect viewRect = NSMakeRect(0, yOffset,
                                kFixedSwitchUserViewWidth,
                                kBlueButtonHeight + kSmallVerticalSpacing);
 
   const AvatarMenu::Item& avatarItem =
       avatarMenu_->GetItemAt(avatarMenu_->GetActiveProfileIndex());
 
   // Adds "Disconnect your Google Account" button at the bottom.
-  NSButton* disconnectButton =
+  NSView* disconnectButton =
       [self hoverButtonWithRect:viewRect
                            text:l10n_util::GetNSString(
                                     IDS_PROFILES_DISCONNECT_BUTTON)
                 imageResourceId:IDR_ICON_PROFILES_MENU_DISCONNECT
                          action:@selector(disconnectProfile:)];
   [container addSubview:disconnectButton];
   yOffset = NSMaxY([disconnectButton frame]);
 
   NSBox* separator = [self horizontalSeparatorWithFrame:
       NSMakeRect(0, yOffset, kFixedSwitchUserViewWidth, 0)];
   [container addSubview:separator];
   yOffset = NSMaxY([separator frame]);
 
   // Adds "Add person" button.
   viewRect.origin.y = yOffset;
-  NSButton* addPersonButton =
+  NSView* addPersonButton =
       [self hoverButtonWithRect:viewRect
                            text:l10n_util::GetNSString(
                                     IDS_PROFILES_ADD_PERSON_BUTTON)
                 imageResourceId:IDR_ICON_PROFILES_MENU_AVATAR
                          action:@selector(showUserManager:)];
   [container addSubview:addPersonButton];
   yOffset = NSMaxY([addPersonButton frame]);
 
   separator = [self horizontalSeparatorWithFrame:
       NSMakeRect(0, yOffset, kFixedSwitchUserViewWidth, 0)];
@@ skipping 31 matching lines @@
 }
 
 // Called when clicked on the settings link.
 - (BOOL)textView:(NSTextView*)textView
    clickedOnLink:(id)link
          atIndex:(NSUInteger)charIndex {
   chrome::ShowSettings(browser_);
   return YES;
 }
 
-- (NSButton*)hoverButtonWithRect:(NSRect)rect
-                            text:(NSString*)text
-                 imageResourceId:(int)imageResourceId
-                          action:(SEL)action {
+- (NSView*)hoverButtonWithRect:(NSRect)rect
+                          text:(NSString*)text
+               imageResourceId:(int)imageResourceId
+                        action:(SEL)action {
   base::scoped_nsobject<BackgroundColorHoverButton> button(
       [[BackgroundColorHoverButton alloc]
-          initWithFrame:rect
+          initWithFrame:NSMakeRect(0, 0, rect.size.width, rect.size.height)
       imageTitleSpacing:kImageTitleSpacing
         backgroundColor:GetDialogBackgroundColor()]);
 
   [button setTitle:text];
   ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
   NSImage* image = rb->GetNativeImageNamed(imageResourceId).ToNSImage();
   [button setDefaultImage:image];
   [button setHoverImage:image];
   [button setPressedImage:image];
   [button setImagePosition:NSImageLeft];
   [button setAlignment:NSLeftTextAlignment];
   [button setBordered:NO];
   [button setTarget:self];
   [button setAction:action];
 
-  return button.autorelease();
+  base::scoped_nsobject<BackgroundColorHoverButtonContainer> container(
+      [[BackgroundColorHoverButtonContainer alloc]
+          initWithFrame:rect
+                 button:button]);
+
+  return container.autorelease();
 }
 
 - (NSButton*)linkButtonWithTitle:(NSString*)title
                      frameOrigin:(NSPoint)frameOrigin
                           action:(SEL)action {
   base::scoped_nsobject<NSButton> link(
       [[HyperlinkButtonCell buttonWithString:title] retain]);
 
   [[link cell] setShouldUnderline:NO];
   [[link cell] setTextColor:gfx::SkColorToCalibratedNSColor(
@@ skipping 77 matching lines @@
 }
 
 - (bool)shouldShowGoIncognito {
   bool incognitoAvailable =
       IncognitoModePrefs::GetAvailability(browser_->profile()->GetPrefs()) !=
           IncognitoModePrefs::DISABLED;
   return incognitoAvailable && !browser_->profile()->IsGuestSession();
 }
 
 @end