Redesign of the avatar menu button.

ui/views/controls/button/menu_button.cc

 // Copyright (c) 2012 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 "ui/views/controls/button/menu_button.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "grit/ui_strings.h"
 #include "ui/base/accessibility/accessible_view_state.h"
@@ skipping 115 matching lines @@
     SetState(STATE_NORMAL);
 
     // We must return false here so that the RootView does not get stuck
     // sending all mouse pressed events to us instead of the appropriate
     // target.
     return false;
   }
   return true;
 }
 
+void MenuButton::PaintMenuMarker(gfx::Canvas* canvas) {

[sky, 2013/10/03 23:23:11]

In general smaller patches are preferable. They make everything go smoother. Can
you split the menu_button change into its own patch?

Also, make the position match the header.

[noms (inactive), 2013/10/07 21:18:15]

Done.

+  const gfx::Insets insets = GetInsets();
+
+  // We can not use the views' mirroring infrastructure for mirroring a
+  // MenuButton control (see TextButton::OnPaint() for a detailed explanation
+  // regarding why we can not flip the canvas). Therefore, we need to
+  // manually mirror the position of the down arrow.
+  gfx::Rect arrow_bounds(width() - insets.right() -
+                         menu_marker_->width() - kMenuMarkerPaddingRight,
+                         height() / 2 - menu_marker_->height() / 2,
+                         menu_marker_->width(),
+                         menu_marker_->height());
+  arrow_bounds.set_x(GetMirroredXForRect(arrow_bounds));
+  canvas->DrawImageInt(*menu_marker_, arrow_bounds.x(), arrow_bounds.y());
+}
+
 void MenuButton::PaintButton(gfx::Canvas* canvas, PaintButtonMode mode) {
   TextButton::PaintButton(canvas, mode);
 
-  if (show_menu_marker_) {
-    gfx::Insets insets = GetInsets();
-
-    // We can not use the views' mirroring infrastructure for mirroring a
-    // MenuButton control (see TextButton::OnPaint() for a detailed explanation
-    // regarding why we can not flip the canvas). Therefore, we need to
-    // manually mirror the position of the down arrow.
-    gfx::Rect arrow_bounds(width() - insets.right() -
-                           menu_marker_->width() - kMenuMarkerPaddingRight,
-                           height() / 2 - menu_marker_->height() / 2,
-                           menu_marker_->width(),
-                           menu_marker_->height());
-    arrow_bounds.set_x(GetMirroredXForRect(arrow_bounds));
-    canvas->DrawImageInt(*menu_marker_, arrow_bounds.x(), arrow_bounds.y());
-  }
+  if (show_menu_marker_)
+    PaintMenuMarker(canvas);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // MenuButton - Events
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 gfx::Size MenuButton::GetPreferredSize() {
   gfx::Size prefsize = TextButton::GetPreferredSize();
@@ skipping 104 matching lines @@
   if (!GetWidget()) {
     NOTREACHED();
     return 0;
   }
 
   gfx::Rect monitor_bounds = GetWidget()->GetWorkAreaBoundsInScreen();
   return monitor_bounds.right() - 1;
 }
 
 }  // namespace views