[Win, Mac] UI fixes for the delete account button in the new avatar bubble.

chrome/browser/ui/views/profiles/profile_chooser_view.cc

 // 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.
 
 #include "chrome/browser/ui/views/profiles/profile_chooser_view.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
@@ skipping 1119 matching lines @@
   layout->StartRow(1, 0);
   layout->AddView(add_account_link_);
   return view;
 }
 
 void ProfileChooserView::CreateAccountButton(views::GridLayout* layout,
                                              const std::string& account,
                                              bool is_primary_account,
                                              int width) {
   ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
-  const gfx::ImageSkia* menu_marker =
+  const gfx::ImageSkia* default_image =
       rb->GetImageNamed(IDR_CLOSE_1).ToImageSkia();
+  int kDeleteButtonWidth = default_image->width();
+  int available_width = width -
+      kDeleteButtonWidth - views::kButtonHEdgeMarginNew;
 
   views::LabelButton* email_button = new BackgroundColorHoverButton(
-      this,
+      NULL,
       gfx::ElideEmail(base::UTF8ToUTF16(account),
                       rb->GetFontList(ui::ResourceBundle::BaseFont),
-                      width - menu_marker->width()),
+                      available_width),
       gfx::ImageSkia(),
       gfx::ImageSkia());
   layout->StartRow(1, 0);
   layout->AddView(email_button);
 
+  // Delete button.
+  views::ImageButton* delete_button = new views::ImageButton(this);
+  delete_button->SetImageAlignment(views::ImageButton::ALIGN_RIGHT,
+                                   views::ImageButton::ALIGN_MIDDLE);
+  delete_button->SetImage(views::ImageButton::STATE_NORMAL,
+                          default_image);
+  delete_button->SetImage(views::ImageButton::STATE_HOVERED,
+                          rb->GetImageSkiaNamed(IDR_CLOSE_1_H));
+  delete_button->SetImage(views::ImageButton::STATE_PRESSED,
+                          rb->GetImageSkiaNamed(IDR_CLOSE_1_P));
+  delete_button->SetBounds(
+      available_width, 0, kDeleteButtonWidth, kButtonHeight);
+
+  email_button->set_notify_enter_exit_on_child(true);
+  email_button->AddChildView(delete_button);
+
   // Save the original email address, as the button text could be elided.
-  current_profile_accounts_map_[email_button] = account;
+  current_profile_accounts_map_[delete_button] = account;
 }
 
 views::View* ProfileChooserView::CreateGaiaSigninView(
     bool add_secondary_account) {
   // Adds Gaia signin webview
   Profile* profile = browser_->profile();
   views::WebView* web_view = new views::WebView(profile);
   signin::Source source = add_secondary_account ?
       signin::SOURCE_AVATAR_BUBBLE_ADD_ACCOUNT :
       signin::SOURCE_AVATAR_BUBBLE_SIGN_IN;
@@ skipping 112 matching lines @@
   layout->StartRowWithPadding(
       1, 0, 0, views::kUnrelatedControlVerticalSpacing);
   layout->AddView(end_preview_and_relaunch_button_);
 
   TitleCard* title_card = new TitleCard(
       IDS_PROFILES_END_PREVIEW, this, &end_preview_cancel_button_);
   return TitleCard::AddPaddedTitleCard(
       view, title_card, kFixedAccountRemovalViewWidth);
 }