[Win] UI fixes for the new avatar button/bubble auth errors.

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 1262 matching lines @@
 
 void ProfileChooserView::CreateAccountButton(views::GridLayout* layout,
                                              const std::string& account,
                                              bool is_primary_account,
                                              bool reauth_required,
                                              int width) {
   ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
   const gfx::ImageSkia* delete_default_image =
       rb->GetImageNamed(IDR_CLOSE_1).ToImageSkia();
   const int kDeleteButtonWidth = delete_default_image->width();
-  const gfx::ImageSkia* warning_default_image = reauth_required ?
-      rb->GetImageNamed(IDR_WARNING).ToImageSkia() : NULL;
+  const gfx::ImageSkia warning_default_image = reauth_required ?
+      *rb->GetImageNamed(IDR_ICON_PROFILES_ACCOUNT_AUTH_ERROR).ToImageSkia() :
+      gfx::ImageSkia();
   const int kWarningButtonWidth = reauth_required ?
-      warning_default_image->width() + views::kRelatedButtonHSpacing : 0;
-  int available_width = width -
-      kDeleteButtonWidth - kWarningButtonWidth - views::kButtonHEdgeMarginNew;
-
+      warning_default_image.width() + views::kRelatedButtonHSpacing : 0;
+  int available_width = width - 2 * views::kButtonHEdgeMarginNew
+      - kDeleteButtonWidth - kWarningButtonWidth;
   views::LabelButton* email_button = new BackgroundColorHoverButton(
-      NULL,
+      reauth_required ? this : NULL,
       gfx::ElideText(base::UTF8ToUTF16(account), gfx::FontList(),
                      available_width, gfx::ELIDE_EMAIL),
-      gfx::ImageSkia(),
-      gfx::ImageSkia());
+      warning_default_image,
+      warning_default_image);
   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,
                           delete_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 + kWarningButtonWidth, 0,
-      kDeleteButtonWidth, kButtonHeight);
+      width - views::kButtonHEdgeMarginNew - kDeleteButtonWidth,
+      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.
   delete_account_button_map_[delete_button] = account;
-
-  // Warning button.
-  if (reauth_required) {
-    views::ImageButton* reauth_button = new views::ImageButton(this);
-    reauth_button->SetImageAlignment(views::ImageButton::ALIGN_LEFT,
-                                     views::ImageButton::ALIGN_MIDDLE);
-    reauth_button->SetImage(views::ImageButton::STATE_NORMAL,
-                            warning_default_image);
-    reauth_button->SetBounds(
-        available_width, 0, kWarningButtonWidth, kButtonHeight);
-
-    email_button->AddChildView(reauth_button);
-    reauth_account_button_map_[reauth_button] = account;
-  }
+  if (reauth_required)
+    reauth_account_button_map_[email_button] = account;
 }
 
 views::View* ProfileChooserView::CreateGaiaSigninView() {
   GURL url;
   int message_id;
 
   switch (view_mode_) {
     case profiles::BUBBLE_VIEW_MODE_GAIA_SIGNIN:
       url = signin::GetPromoURL(signin::SOURCE_AVATAR_BUBBLE_SIGN_IN,
                                 false /* auto_close */,
@@ skipping 132 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);
 }