Redesign of the avatar menu button.

chrome/browser/ui/views/new_avatar_button.cc

Index: chrome/browser/ui/views/new_avatar_button.cc
diff --git a/chrome/browser/ui/views/new_avatar_button.cc b/chrome/browser/ui/views/new_avatar_button.cc
new file mode 100644
index 0000000000000000000000000000000000000000..e28caa5c1fa5496c689ee3f41669c3a3d6aa3a6f
--- /dev/null
+++ b/chrome/browser/ui/views/new_avatar_button.cc
@@ -0,0 +1,119 @@
+// Copyright 2013 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/new_avatar_button.h"
+
+#include "grit/generated_resources.h"
+#include "grit/theme_resources.h"
+#include "ui/base/l10n/l10n_util.h"
+#include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/canvas.h"
+#include "ui/gfx/color_utils.h"
+#include "ui/views/border.h"
+#include "ui/views/painter.h"
+
+namespace {
+
+// Text padding within the button border.
+const int kInset = 10;
+
+
+// AvatarGlassButtonBorder ----------------------------------------------------
+class AvatarGlassButtonBorder : public views::TextButtonDefaultBorder {

[sky, 2013/10/08 21:29:25]

Can you make the set_**painter buttons public in TextButtonBorder and not
subclass?

[noms (inactive), 2013/10/09 15:12:47]

Do you mean move them from TextButtonDefaultBorder to TextButtonBorder? Then I'm
not sure we'd need both classes (there would be nothing left in
TextButtonDefaultBorder)

On 2013/10/08 21:29:25, sky wrote:

[sky, 2013/10/09 20:22:49]

I mean rather than subclassing create a TextButtonDefaultBorder and invoke
set_XXX_painter.

On 2013/10/09 15:12:47, Monica Dinculescu wrote:

[noms (inactive), 2013/10/09 21:26:32]

Oh that is way nicer. Thanks! Done.

On 2013/10/09 20:22:49, sky wrote:

+ public:
+  AvatarGlassButtonBorder() {
+    const int kNormalImageSet[] = IMAGE_GRID(IDR_AVATAR_GLASS_BUTTON_NORMAL);
+    const int kHotImageSet[] = IMAGE_GRID(IDR_AVATAR_GLASS_BUTTON_HOVER);
+    const int kPushedImageSet[] = IMAGE_GRID(IDR_AVATAR_GLASS_BUTTON_PRESSED);
+
+    SetInsets(gfx::Insets(kInset, kInset, kInset, kInset));
+    set_normal_painter(views::Painter::CreateImageGridPainter(kNormalImageSet));
+    set_hot_painter(views::Painter::CreateImageGridPainter(kHotImageSet));
+    set_pushed_painter(views::Painter::CreateImageGridPainter(kPushedImageSet));
+  };

[sky, 2013/10/08 21:29:25]

nit: no ; here, 38, 57 and 61.

[noms (inactive), 2013/10/09 15:12:47]

Done.

+
+ private:
+  virtual ~AvatarGlassButtonBorder() {
+  };
+
+  DISALLOW_COPY_AND_ASSIGN(AvatarGlassButtonBorder);
+};
+
+
+// AvatarThemedButtonBorder ---------------------------------------------------
+
+class AvatarThemedButtonBorder : public views::TextButtonDefaultBorder {
+ public:
+  AvatarThemedButtonBorder() {
+    const int kNormalImageSet[] = IMAGE_GRID(IDR_AVATAR_THEMED_BUTTON_NORMAL);
+    const int kHotImageSet[] = IMAGE_GRID(IDR_AVATAR_THEMED_BUTTON_HOVER);
+    const int kPushedImageSet[] = IMAGE_GRID(IDR_AVATAR_THEMED_BUTTON_PRESSED);
+
+    SetInsets(gfx::Insets(kInset, kInset, kInset, kInset));
+    set_normal_painter(views::Painter::CreateImageGridPainter(kNormalImageSet));
+    set_hot_painter(views::Painter::CreateImageGridPainter(kHotImageSet));
+    set_pushed_painter(views::Painter::CreateImageGridPainter(kPushedImageSet));
+  };
+
+ private:
+  virtual ~AvatarThemedButtonBorder() {
+  };
+
+  DISALLOW_COPY_AND_ASSIGN(AvatarThemedButtonBorder);
+};
+
+}  // namespace
+
+
+// NewAvatarButton ------------------------------------------------------------
+NewAvatarButton::NewAvatarButton(
+    views::ButtonListener* listener,
+    const string16& profile_name,
+    AvatarButtonStyle button_style)
+  : MenuButton(listener, profile_name, NULL, true) {

[sky, 2013/10/08 21:29:25]

nit: indent 2 more.

[noms (inactive), 2013/10/09 15:12:47]

Done.

+  set_animate_on_state_change(false);
+
+  ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
+  SetFont(rb->GetFont(ui::ResourceBundle::BaseFont));
+
+  if (button_style == GLASS_BUTTON) {
+    set_border(new AvatarGlassButtonBorder);
+    set_menu_marker(
+        rb->GetImageNamed(IDR_AVATAR_GLASS_BUTTON_DROPARROW).ToImageSkia());
+  } else {
+    set_border(new AvatarThemedButtonBorder);
+    set_menu_marker(
+        rb->GetImageNamed(IDR_AVATAR_THEMED_BUTTON_DROPARROW).ToImageSkia());
+  }
+  SchedulePaint();
+}
+
+NewAvatarButton::~NewAvatarButton() {
+}
+
+void NewAvatarButton::OnPaint(gfx::Canvas* canvas) {
+  // From TextButton::PaintButton, draw everything but the text.
+  OnPaintBackground(canvas);
+  OnPaintBorder(canvas);
+  OnPaintFocusBorder(canvas);
+
+  gfx::Rect rect;
+  // In RTL languages the marker gets drawn leftmost, so account for its offset.
+  if (base::i18n::IsRTL())
+    rect = gfx::Rect(-kInset, 0, size().width(), size().height());
+  else
+    rect = gfx::Rect(kInset, 0, size().width(), size().height());
+  // TODO(noms): This should be DrawStringRectWithHalo but that function
+  // has a bug at the moment and incorrectly draws the background.
+  canvas->DrawStringRectWithFlags(
+      text(),
+      gfx::FontList(ui::ResourceBundle::GetSharedInstance().GetFont(
+          ui::ResourceBundle::BaseFont)),
+      SK_ColorBLACK,
+      rect,
+      gfx::Canvas::NO_SUBPIXEL_RENDERING);
+
+  // From MenuButton::PaintButton, paint the marker
+  PaintMenuMarker(canvas);
+}