[Win, Mac] UI fixes for the delete account button 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 "chrome/browser/ui/cocoa/profiles/profile_chooser_controller.h"
 
 #include "base/mac/bundle_locations.h"
 #include "base/prefs/pref_service.h"
@@ skipping 697 matching lines @@
                  imageResourceId:(int)imageResourceId
         alternateImageResourceId:(int)alternateImageResourceId
                           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.
+// Creates an email account button with |title| and a remove icon. |tag|
+// indicates which account the button refers to.
 - (NSButton*)accountButtonWithRect:(NSRect)rect
-                             title:(const std::string&)title;
+                             title:(const std::string&)title
+                               tag:(int)tag;
 
 @end
 
 @implementation ProfileChooserController
 - (BubbleViewMode) viewMode {
   return viewMode_;
 }
 
 - (IBAction)switchToProfile:(id)sender {
   // Check the event flags to see if a new window should be created.
@@ skipping 599 matching lines @@
       SigninManagerFactory::GetForProfile(profile)->GetAuthenticatedUsername();
   DCHECK(!primaryAccount.empty());
   std::vector<std::string>accounts =
       profiles::GetSecondaryAccountsForProfile(profile, primaryAccount);
 
   rect.origin.y = 0;
   for (size_t i = 0; i < accounts.size(); ++i) {
     // Save the original email address, as the button text could be elided.
     currentProfileAccounts_[i] = accounts[i];
     NSButton* accountButton = [self accountButtonWithRect:rect
-                                                    title:accounts[i]];
-    [accountButton setTag:i];
+                                                    title:accounts[i]
+                                                      tag:i];
     [container addSubview:accountButton];
     rect.origin.y = NSMaxY([accountButton frame]);
   }
 
   // The primary account should always be listed first.
   NSButton* accountButton = [self accountButtonWithRect:rect
-                                                  title:primaryAccount];
+                                                  title:primaryAccount
+                                                    tag:kPrimaryProfileTag];
   [container addSubview:accountButton];
   [container setFrameSize:NSMakeSize(NSWidth([container frame]),
                                      NSMaxY([accountButton frame]))];
-  [accountButton setTag:kPrimaryProfileTag];
   return container.autorelease();
 }
 
 - (NSView*)buildGaiaEmbeddedView {
   base::scoped_nsobject<NSView> container(
       [[NSView alloc] initWithFrame:NSZeroRect]);
   CGFloat yOffset = 0;
 
   bool addSecondaryAccount = viewMode_ == BUBBLE_VIEW_MODE_GAIA_ADD_ACCOUNT;
   signin::Source source = addSecondaryAccount ?
@@ skipping 152 matching lines @@
   [link setFont:[NSFont labelFontOfSize:kTextFontSize]];
   [link setTarget:self];
   [link setAction:action];
   [link setFrameOrigin:frameOrigin];
   [link sizeToFit];
 
   return link.autorelease();
 }
 
 - (NSButton*)accountButtonWithRect:(NSRect)rect
-                             title:(const std::string&)title {
+                             title:(const std::string&)title
+                               tag:(int)tag {
   NSColor* backgroundColor = gfx::SkColorToCalibratedNSColor(
       profiles::kAvatarBubbleAccountsBackgroundColor);
   base::scoped_nsobject<BackgroundColorHoverButton> button(
       [[BackgroundColorHoverButton alloc] initWithFrame:rect
                                       imageTitleSpacing:0
                                         backgroundColor:backgroundColor]);
-
-  [button setTitle:ElideEmail(title, rect.size.width)];
+  ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
+  NSImage* defaultImage = rb->GetNativeImageNamed(IDR_CLOSE_1).AsNSImage();
+  CGFloat kDeleteButtonWidth = [defaultImage size].width;
+  CGFloat availableWidth = rect.size.width -
+      kDeleteButtonWidth - kHorizontalSpacing;
+  [button setTitle:ElideEmail(title, availableWidth)];
   [button setAlignment:NSLeftTextAlignment];
   [button setBordered:NO];
-  [button setTarget:self];
-  [button setAction:@selector(showAccountRemovalView:)];
 
+  // Delete button.
+  rect.origin = NSMakePoint(availableWidth, 0);
+  rect.size.width = kDeleteButtonWidth;
+  base::scoped_nsobject<HoverImageButton> deleteButton(
+      [[HoverImageButton alloc] initWithFrame:rect]);
+  [deleteButton setBordered:NO];
+  [deleteButton setDefaultImage:defaultImage];
+  [deleteButton setHoverImage:rb->GetNativeImageNamed(
+      IDR_CLOSE_1_H).ToNSImage()];
+  [deleteButton setPressedImage:rb->GetNativeImageNamed(
+      IDR_CLOSE_1_P).ToNSImage()];
+  [deleteButton setTarget:self];
+  [deleteButton setAction:@selector(showAccountRemovalView:)];
+  [deleteButton setTag:tag];
+
+  [button addSubview:deleteButton];
   return button.autorelease();
 }
 
 @end