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

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

Index: chrome/browser/ui/views/profiles/new_avatar_button.cc
diff --git a/chrome/browser/ui/views/profiles/new_avatar_button.cc b/chrome/browser/ui/views/profiles/new_avatar_button.cc
index 117f703edd5f3505f2c7f86bcfde089611349b8d..dcfd28df4a4c7fdff3e8860baa28f7a5e07be8de 100644
--- a/chrome/browser/ui/views/profiles/new_avatar_button.cc
+++ b/chrome/browser/ui/views/profiles/new_avatar_button.cc
@@ -27,16 +27,11 @@
 
 namespace {
 
-// Text padding within the button border.
-const int kLeftRightInset = 7;
-const int kTopBottomInset = 2;
-
 scoped_ptr<views::Border> CreateBorder(const int normal_image_set[],
                                        const int hot_image_set[],
                                        const int pushed_image_set[]) {
   scoped_ptr<views::LabelButtonBorder> border(
       new views::LabelButtonBorder(views::Button::STYLE_TEXTBUTTON));
-
   border->SetPainter(false, views::Button::STATE_NORMAL,
       views::Painter::CreateImageGridPainter(normal_image_set));
   border->SetPainter(false, views::Button::STATE_HOVERED,
@@ -44,8 +39,11 @@ scoped_ptr<views::Border> CreateBorder(const int normal_image_set[],
   border->SetPainter(false, views::Button::STATE_PRESSED,
       views::Painter::CreateImageGridPainter(pushed_image_set));
 
-  border->set_insets(gfx::Insets(kTopBottomInset, kLeftRightInset,
-                                 kTopBottomInset, kLeftRightInset));
+  const int kLeftRightInset = 10;
+  const int kTopInset = 0;
+  const int kBottomInset = 4;
+  border->set_insets(gfx::Insets(kTopInset, kLeftRightInset,
+                                 kBottomInset, kLeftRightInset));
 
   return border.PassAs<views::Border>();
 }
@@ -95,7 +93,8 @@ NewAvatarButton::NewAvatarButton(
     const int kHotImageSet[] = IMAGE_GRID(IDR_AVATAR_THEMED_BUTTON_HOVER);
     const int kPushedImageSet[] = IMAGE_GRID(IDR_AVATAR_THEMED_BUTTON_PRESSED);
 
-    SetBorder(CreateBorder(kNormalImageSet, kHotImageSet, kPushedImageSet));
+    SetBorder(
+        CreateBorder(kNormalImageSet, kHotImageSet, kPushedImageSet));

[msw, 2014/06/19 16:04:19]

Nit: revert these spacing changes.

[noms (inactive), 2014/06/19 17:04:01]

Done.

     set_menu_marker(
         rb->GetImageNamed(IDR_AVATAR_THEMED_BUTTON_DROPARROW).ToImageSkia());
   } else if (is_win8) {
@@ -103,7 +102,8 @@ NewAvatarButton::NewAvatarButton(
     const int kHotImageSet[] = IMAGE_GRID(IDR_AVATAR_METRO_BUTTON_HOVER);
     const int kPushedImageSet[] = IMAGE_GRID(IDR_AVATAR_METRO_BUTTON_PRESSED);
 
-    SetBorder(CreateBorder(kNormalImageSet, kHotImageSet, kPushedImageSet));
+    SetBorder(
+        CreateBorder(kNormalImageSet, kHotImageSet, kPushedImageSet));
     set_menu_marker(
         rb->GetImageNamed(IDR_AVATAR_METRO_BUTTON_DROPARROW).ToImageSkia());
   } else {
@@ -111,7 +111,8 @@ NewAvatarButton::NewAvatarButton(
     const int kHotImageSet[] = IMAGE_GRID(IDR_AVATAR_GLASS_BUTTON_HOVER);
     const int kPushedImageSet[] = IMAGE_GRID(IDR_AVATAR_GLASS_BUTTON_PRESSED);
 
-    SetBorder(CreateBorder(kNormalImageSet, kHotImageSet, kPushedImageSet));
+    SetBorder(
+        CreateBorder(kNormalImageSet, kHotImageSet, kPushedImageSet));
     set_menu_marker(
         rb->GetImageNamed(IDR_AVATAR_GLASS_BUTTON_DROPARROW).ToImageSkia());
   }
@@ -163,8 +164,8 @@ void NewAvatarButton::OnErrorChanged() {
   const SigninErrorController* error =
       profiles::GetSigninErrorController(browser_->profile());
   if (error && error->HasError()) {
-    ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
-    icon = *rb->GetImageNamed(IDR_WARNING).ToImageSkia();
+    icon = *ui::ResourceBundle::GetSharedInstance().GetImageNamed(
+        IDR_ICON_PROFILES_AVATAR_BUTTON_ERROR).ToImageSkia();
   }
 
   SetImage(views::Button::STATE_NORMAL, icon);