Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(230)

Unified Diff: ui/views/examples/menu_example.cc

Issue 9693022: views: Rename MenuButtonDelegate::RunMenu to something more obvious. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: menu_button_listener.h Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/controls/button/menu_button_listener.h ('k') | ui/views/views.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/examples/menu_example.cc
diff --git a/ui/views/examples/menu_example.cc b/ui/views/examples/menu_example.cc
index db5cee19340b9046e84caa3dc3311fd2282d5be4..9eafcb6a28c0088b86d813694674abcc31ffd424 100644
--- a/ui/views/examples/menu_example.cc
+++ b/ui/views/examples/menu_example.cc
@@ -9,7 +9,7 @@
#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/menu_button_listener.h"
#include "ui/views/controls/button/text_button.h"
#include "ui/views/controls/menu/menu_2.h"
#include "ui/views/layout/fill_layout.h"
@@ -59,14 +59,15 @@ class ExampleMenuModel : public ui::SimpleMenuModel,
DISALLOW_COPY_AND_ASSIGN(ExampleMenuModel);
};
-class ExampleMenuButton : public MenuButton, public MenuButtonDelegate {
+class ExampleMenuButton : public MenuButton, public MenuButtonListener {
public:
ExampleMenuButton(const string16& test, bool show_menu_marker);
virtual ~ExampleMenuButton();
private:
- // Overridden from MenuButtonDelegate:
- virtual void RunMenu(View* source, const gfx::Point& point) OVERRIDE;
+ // Overridden from MenuButtonListener:
+ virtual void OnMenuButtonClicked(View* source,
+ const gfx::Point& point) OVERRIDE;
scoped_ptr<ExampleMenuModel> menu_model_;
DISALLOW_COPY_AND_ASSIGN(ExampleMenuButton);
@@ -187,7 +188,8 @@ ExampleMenuButton::ExampleMenuButton(const string16& test,
ExampleMenuButton::~ExampleMenuButton() {
}
-void ExampleMenuButton::RunMenu(View* source, const gfx::Point& point) {
+void ExampleMenuButton::OnMenuButtonClicked(View* source,
+ const gfx::Point& point) {
if (!menu_model_.get())
menu_model_.reset(new ExampleMenuModel);
« no previous file with comments | « ui/views/controls/button/menu_button_listener.h ('k') | ui/views/views.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698