Support displaying the avatar label on the right side.

chrome/browser/ui/views/avatar_label.cc

 // 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/avatar_label.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/views/avatar_menu_bubble_view.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/theme_provider.h"
 #include "ui/events/event.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/font_list.h"
 #include "ui/views/painter.h"
 
 namespace {
 
 // A special text button border for the managed user avatar label.
 class AvatarLabelBorder: public views::TextButtonBorder {
  public:
-  explicit AvatarLabelBorder();
+  explicit AvatarLabelBorder(bool label_on_right);
 
   // views::TextButtonBorder:
   virtual void Paint(const views::View& view, gfx::Canvas* canvas) OVERRIDE;
   virtual gfx::Size GetMinimumSize() const OVERRIDE;
 
  private:
   scoped_ptr<views::Painter> painter_;
 
   DISALLOW_COPY_AND_ASSIGN(AvatarLabelBorder);
 };
 
-AvatarLabelBorder::AvatarLabelBorder() {
-  const int kHorizontalInsetRight = 10;
-  const int kHorizontalInsetLeft = 43;
+AvatarLabelBorder::AvatarLabelBorder(bool label_on_right) {
+  const int kHorizontalInsetRight = label_on_right ? 43 : 10;
+  const int kHorizontalInsetLeft = label_on_right ? 10 : 43;
   const int kVerticalInsetTop = 2;
   const int kVerticalInsetBottom = 3;
   // We want to align with the top of the tab. This works if the default font
   // size is 13. If it is smaller, we need to increase the TopInset accordingly.
   const gfx::FontList font_list;
   int difference =
       (font_list.GetFontSize() < 13) ? 13 - font_list.GetFontSize() : 0;
   int addToTop = difference / 2;
   int addToBottom = difference - addToTop;
   SetInsets(gfx::Insets(kVerticalInsetTop + addToTop,
@@ skipping 33 matching lines @@
 }
 
 gfx::Size AvatarLabelBorder::GetMinimumSize() const {
   gfx::Size size(4, 4);
   size.SetToMax(painter_->GetMinimumSize());
   return size;
 }
 
 }  // namespace
 
+// static
+const char AvatarLabel::kViewClassName[] = "AvatarLabel";
+
 AvatarLabel::AvatarLabel(BrowserView* browser_view)
     : TextButton(NULL,
                  l10n_util::GetStringUTF16(IDS_MANAGED_USER_AVATAR_LABEL)),
-      browser_view_(browser_view) {
+      browser_view_(browser_view), label_on_right_(false) {

[Peter Kasting, 2014/01/15 02:06:26]

Nit: One member per line

[Adrian Kuegel, 2014/01/15 16:24:51]

Done.

   ClearMaxTextSize();
-  set_border(new AvatarLabelBorder);
+  set_border(new AvatarLabelBorder(label_on_right_));
   UpdateLabelStyle();
 }
 
 AvatarLabel::~AvatarLabel() {}
 
+const char* AvatarLabel::GetClassName() const {
+  return kViewClassName;
+}
+
 bool AvatarLabel::OnMousePressed(const ui::MouseEvent& event) {
   if (!TextButton::OnMousePressed(event))
     return false;
 
   browser_view_->ShowAvatarBubbleFromAvatarButton();
   return true;
 }
 
 void AvatarLabel::UpdateLabelStyle() {
+  // |browser_view_| can be NULL in unit tests.
+  if (!browser_view_)
+    return;
+
   SkColor color_label = browser_view_->frame()->GetThemeProvider()->GetColor(
       ThemeProperties::COLOR_MANAGED_USER_LABEL);
   SetEnabledColor(color_label);
   SetHighlightColor(color_label);
   SetHoverColor(color_label);
   SetDisabledColor(color_label);
   SchedulePaint();
 }
+
+void AvatarLabel::SetLabelOnRight(bool label_on_right) {
+  if (label_on_right_ != label_on_right) {

[Peter Kasting, 2014/01/15 02:06:26]

Nit: Do we actually need this conditional?  If we just did things
unconditionally, we could also replace the initializer and set_border() call in
the constructor with a single call to this function.  Or is
OpaqueBrowserFrameViewLayout::LayoutAvatar() called too often?

[Adrian Kuegel, 2014/01/15 16:24:51]

I checked it now, and it looks it is called only on user interaction (apart from
initialization), like when clicking on some item. So it should be fine to always
call set_border(), and I changed it like this.

+    label_on_right_ = label_on_right;
+    set_border(new AvatarLabelBorder(label_on_right_));
+  }
+}