summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/notifications/balloon_view.cc
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-15 19:34:39 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-15 19:34:39 +0000
commit723538f823510b20c8a14b9c9acf3812d598348f (patch)
tree065ecf7c74e7d1f5c10263afa1f3984ccdb23cd8 /chrome/browser/chromeos/notifications/balloon_view.cc
parent104432dfcc31a165979d7be9cabf7d43429cab60 (diff)
downloadchromium_src-723538f823510b20c8a14b9c9acf3812d598348f.zip
chromium_src-723538f823510b20c8a14b9c9acf3812d598348f.tar.gz
chromium_src-723538f823510b20c8a14b9c9acf3812d598348f.tar.bz2
views: Rename MenuButtonDelegate::RunMenu to something more obvious.
The reason is that there are a lot of RunMenu() functions all over the code, and actually the event for this function is that the menu button was pressed. So we tell that to subclasses and they do whatever they want; they do not necessarily need to run a menu. Thus this patch renames RunMenu to OnMenuButtonClicked. BUG=117092 R=sky@chromium.org TBR=stevenjb@chromium.org Review URL: https://chromiumcodereview.appspot.com/9693022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126967 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/notifications/balloon_view.cc')
-rw-r--r--chrome/browser/chromeos/notifications/balloon_view.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/chromeos/notifications/balloon_view.cc b/chrome/browser/chromeos/notifications/balloon_view.cc
index 3d4b0b9..85f4f70 100644
--- a/chrome/browser/chromeos/notifications/balloon_view.cc
+++ b/chrome/browser/chromeos/notifications/balloon_view.cc
@@ -34,7 +34,7 @@
#include "ui/views/controls/button/button.h"
#include "ui/views/controls/button/image_button.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/label.h"
#include "ui/views/controls/menu/menu_item_view.h"
#include "ui/views/controls/menu/menu_model_adapter.h"
@@ -61,7 +61,7 @@ namespace chromeos {
// NotificationControlView has close and menu buttons and
// overlays on top of renderer view.
class NotificationControlView : public views::View,
- public views::MenuButtonDelegate,
+ public views::MenuButtonListener,
public ui::SimpleMenuModel::Delegate,
public views::ButtonListener {
public:
@@ -121,8 +121,9 @@ class NotificationControlView : public views::View,
return total_bounds.size();
}
- // views::MenuButtonDelegate implements.
- virtual void RunMenu(views::View* source, const gfx::Point& pt) {
+ // Overridden from views::MenuButtonListener:
+ virtual void OnMenuButtonClicked(views::View* source,
+ const gfx::Point& point) OVERRIDE {
CreateOptionsMenu();
views::MenuModelAdapter menu_model_adapter(options_menu_contents_.get());