Simplify ProfileMenuButton.

chrome/browser/ui/views/profile_menu_button.cc

Index: chrome/browser/ui/views/profile_menu_button.cc
diff --git a/chrome/browser/ui/views/profile_menu_button.cc b/chrome/browser/ui/views/profile_menu_button.cc
index c7db54ef842c784cf5dfcc032ca501581bd4d622..fbbe5b0857b6508bb928faa8fd7df94620660460 100644
--- a/chrome/browser/ui/views/profile_menu_button.cc
+++ b/chrome/browser/ui/views/profile_menu_button.cc
@@ -10,7 +10,6 @@
 #include "ui/gfx/color_utils.h"
 #include "views/controls/button/button.h"
 #include "views/controls/menu/menu_2.h"
-#include "views/controls/menu/view_menu_delegate.h"
 
 // Menu should display below the profile button tag image on the frame. This
 // offset size depends on whether the frame is in glass or opaque mode.
@@ -28,11 +27,8 @@ const int kProfileButtonBorderSpacing = 10;
 // Maximum width for name string in pixels.
 const int kMaxTextWidth = 200;
 
-ProfileMenuButton::ProfileMenuButton(views::ButtonListener* listener,
-                                     const std::wstring& text,
-                                     views::ViewMenuDelegate* menu_delegate,
-                                     Profile* profile)
-    : MenuButton(listener, text, menu_delegate, true) {
+ProfileMenuButton::ProfileMenuButton(const std::wstring& text, Profile* profile)
+    : MenuButton(NULL, text, this, true) {
   // Turn off hover highlighting and position button in the center of the
   // underlying profile tag image.
   set_border(views::Border::CreateEmptyBorder(
@@ -52,12 +48,6 @@ void ProfileMenuButton::SetText(const std::wstring& text) {
                       font(), kMaxTextWidth, false)));
 }
 
-void ProfileMenuButton::RunMenuAt(const gfx::Point& pt) {
-  gfx::Point menu_point(pt.x(),
-                        pt.y() + kMenuDisplayOffset);
-  menu_->RunMenuAt(menu_point, views::Menu2::ALIGN_TOPRIGHT);
-}
-
 // ui::SimpleMenuModel::Delegate implementation
 bool ProfileMenuButton::IsCommandIdChecked(int command_id) const {
   return false;
@@ -82,3 +72,10 @@ void ProfileMenuButton::ExecuteCommand(int command_id) {
       break;
   }
 }
+
+// views::ViewMenuDelegate implementation
+void ProfileMenuButton::RunMenu(views::View* source, const gfx::Point &pt) {
+  gfx::Point menu_point(pt.x(),

[Ben Goodger (Google), 2011/05/19 04:16:21]

nit: single line

+                        pt.y() + kMenuDisplayOffset);
+  menu_->RunMenuAt(menu_point, views::Menu2::ALIGN_TOPRIGHT);
+}