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

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

Index: chrome/browser/ui/views/profiles/profile_chooser_view.cc
diff --git a/chrome/browser/ui/views/profiles/profile_chooser_view.cc b/chrome/browser/ui/views/profiles/profile_chooser_view.cc
index a110cac6ba5d5435cd9c899ff1fd423b228c2cb6..377b48182fc92a647cc8dc93b03cba7e5b509ec7 100644
--- a/chrome/browser/ui/views/profiles/profile_chooser_view.cc
+++ b/chrome/browser/ui/views/profiles/profile_chooser_view.cc
@@ -1226,14 +1226,15 @@ void ProfileChooserView::CreateAccountButton(views::GridLayout* layout,
       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;
+      rb->GetImageNamed(IDR_ICON_PROFILES_ACCOUNT_BUTTON_ERROR).ToImageSkia() :
+      NULL;
   const int kWarningButtonWidth = reauth_required ?
       warning_default_image->width() + views::kRelatedButtonHSpacing : 0;
   int available_width = width -
       kDeleteButtonWidth - kWarningButtonWidth - views::kButtonHEdgeMarginNew;
 
   views::LabelButton* email_button = new BackgroundColorHoverButton(
-      NULL,
+      reauth_required ? this : NULL,
       gfx::ElideEmail(base::UTF8ToUTF16(account),
                       rb->GetFontList(ui::ResourceBundle::BaseFont),
                       available_width),
@@ -1264,16 +1265,12 @@ void ProfileChooserView::CreateAccountButton(views::GridLayout* layout,
 
   // 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(
+    views::ImageView* reauth_icon = new views::ImageView();
+    reauth_icon->SetImage(warning_default_image);
+    reauth_icon->SetBounds(
         available_width, 0, kWarningButtonWidth, kButtonHeight);
-
-    email_button->AddChildView(reauth_button);
-    reauth_account_button_map_[reauth_button] = account;
+    email_button->AddChildView(reauth_icon);
+    reauth_account_button_map_[email_button] = account;
   }
 }