views: Rename ViewMenuDelegate to MenuButtonDelegate and move to controls/button/.

The reason is that why was founding difficult to know what ViewMenuDelegate was referring to.
And because this delegate is always associated with a views::MenuButton.

BUG=117092
R=sky@chromium.org
TBR=stevenjb@chromium.org

Review URL: https://chromiumcodereview.appspot.com/9632001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125650 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 21 insertions, 23 deletions

diff --git a/ui/views/controls/button/menu_button.cc b/ui/views/controls/button/menu_button.cc
index 098e64f..68b5210 100644
--- a/ui/views/controls/button/menu_button.cc
+++ b/ui/views/controls/button/menu_button.cc
@@ -15,7 +15,7 @@
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/controls/button/button.h"
-#include "ui/views/controls/menu/view_menu_delegate.h"
+#include "ui/views/controls/button/menu_button_delegate.h"
 #include "ui/views/events/event.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
@@ -48,7 +48,7 @@ const char MenuButton::kViewClassName[] = "views/MenuButton";
 
 MenuButton::MenuButton(ButtonListener* listener,
                        const string16& text,
-                       ViewMenuDelegate* menu_delegate,
+                       MenuButtonDelegate* menu_delegate,
                        bool show_menu_marker)
     : TextButton(listener, text),
       menu_visible_(false),
diff --git a/ui/views/controls/button/menu_button.h b/ui/views/controls/button/menu_button.h
index 7f39e77..35702fe 100644
--- a/ui/views/controls/button/menu_button.h
+++ b/ui/views/controls/button/menu_button.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -17,7 +17,7 @@
 namespace views {
 
 class MouseEvent;
-class ViewMenuDelegate;
+class MenuButtonDelegate;
 
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -34,7 +34,7 @@ class VIEWS_EXPORT MenuButton : public TextButton {
   // Create a Button.
   MenuButton(ButtonListener* listener,
              const string16& text,
-             ViewMenuDelegate* menu_delegate,
+             MenuButtonDelegate* menu_delegate,
              bool show_menu_marker);
   virtual ~MenuButton();
 
@@ -84,7 +84,7 @@ class VIEWS_EXPORT MenuButton : public TextButton {
   base::Time menu_closed_time_;
 
   // The associated menu's resource identifier.
-  ViewMenuDelegate* menu_delegate_;
+  MenuButtonDelegate* menu_delegate_;
 
   // Whether or not we're showing a drop marker.
   bool show_menu_marker_;
diff --git a/ui/views/controls/menu/view_menu_delegate.h b/ui/views/controls/button/menu_button_delegate.h
index ef243e0..b296e44 100644
--- a/ui/views/controls/menu/view_menu_delegate.h
+++ b/ui/views/controls/button/menu_button_delegate.h
@@ -1,13 +1,11 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef UI_VIEWS_CONTROLS_MENU_VIEW_MENU_DELEGATE_H_
-#define UI_VIEWS_CONTROLS_MENU_VIEW_MENU_DELEGATE_H_
+#ifndef UI_VIEWS_CONTROLS_BUTTON_MENU_BUTTON_DELEGATE_H_
+#define UI_VIEWS_CONTROLS_BUTTON_MENU_BUTTON_DELEGATE_H_
 #pragma once
 
-#include "ui/gfx/native_widget_types.h"
-
 namespace gfx {
 class Point;
 }
@@ -18,23 +16,23 @@ class View;
 
 ////////////////////////////////////////////////////////////////////////////////
 //
-// ViewMenuDelegate
+// MenuButtonDelegate
 //
 // An interface that allows a component to tell a View about a menu that it
 // has constructed that the view can show (e.g. for MenuButton views, or as a
 // context menu.)
 //
 ////////////////////////////////////////////////////////////////////////////////
-class ViewMenuDelegate {
+class MenuButtonDelegate {
  public:
-  // Create and show a menu at the specified position. Source is the view the
-  // ViewMenuDelegate was set on.
-  virtual void RunMenu(View* source, const gfx::Point& pt) = 0;
+  // Creates and shows a menu at the specified position. |source| is the view
+  // the MenuButtonDelegate was set on.
+  virtual void RunMenu(View* source, const gfx::Point& point) = 0;
 
  protected:
-  virtual ~ViewMenuDelegate() {}
+  virtual ~MenuButtonDelegate() {}
 };
 
 }  // namespace views
 
-#endif  // UI_VIEWS_CONTROLS_MENU_VIEW_MENU_DELEGATE_H_
+#endif  // UI_VIEWS_CONTROLS_BUTTON_MENU_BUTTON_DELEGATE_H_
diff --git a/ui/views/examples/menu_example.cc b/ui/views/examples/menu_example.cc
index 50640c3..db5cee1 100644
--- a/ui/views/examples/menu_example.cc
+++ b/ui/views/examples/menu_example.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -9,9 +9,9 @@
 #include "base/utf_string_conversions.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/views/controls/button/menu_button.h"
+#include "ui/views/controls/button/menu_button_delegate.h"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/menu/menu_2.h"
-#include "ui/views/controls/menu/view_menu_delegate.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/view.h"
 
@@ -59,13 +59,13 @@ class ExampleMenuModel : public ui::SimpleMenuModel,
   DISALLOW_COPY_AND_ASSIGN(ExampleMenuModel);
 };
 
-class ExampleMenuButton : public MenuButton, public ViewMenuDelegate {
+class ExampleMenuButton : public MenuButton, public MenuButtonDelegate {
  public:
   ExampleMenuButton(const string16& test, bool show_menu_marker);
   virtual ~ExampleMenuButton();
 
  private:
-  // Overridden from ViewMenuDelegate:
+  // Overridden from MenuButtonDelegate:
   virtual void RunMenu(View* source, const gfx::Point& point) OVERRIDE;
 
   scoped_ptr<ExampleMenuModel> menu_model_;
diff --git a/ui/views/views.gyp b/ui/views/views.gyp
index 68da3d9..cffde5c 100644
--- a/ui/views/views.gyp
+++ b/ui/views/views.gyp
@@ -80,6 +80,7 @@
         'controls/button/image_button.h',
         'controls/button/menu_button.cc',
         'controls/button/menu_button.h',
+        'controls/button/menu_button_delegate.h',
         'controls/button/radio_button.cc',
         'controls/button/radio_button.h',
         'controls/button/text_button.cc',
@@ -154,7 +155,6 @@
         'controls/menu/menu_image_util.h',
         'controls/menu/submenu_view.cc',
         'controls/menu/submenu_view.h',
-        'controls/menu/view_menu_delegate.h',
         'controls/message_box_view.cc',
         'controls/message_box_view.h',
         'controls/native_control.cc',