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

Unified Diff: chrome/browser/ui/views/toolbar_view.h

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 | « chrome/browser/ui/views/tabs/tab_strip.cc ('k') | chrome/browser/ui/views/toolbar_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/toolbar_view.h
diff --git a/chrome/browser/ui/views/toolbar_view.h b/chrome/browser/ui/views/toolbar_view.h
index 1ad84f9747ee692605c706e06bed6be6d2cf5c1b..fbaa688e2261181bb8dab1c8b8ba4651b3867573 100644
--- a/chrome/browser/ui/views/toolbar_view.h
+++ b/chrome/browser/ui/views/toolbar_view.h
@@ -20,7 +20,7 @@
#include "ui/base/animation/slide_animation.h"
#include "ui/views/accessible_pane_view.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/view.h"
class BrowserActionsContainer;
@@ -33,7 +33,7 @@ class MenuListener;
// The Browser Window's toolbar.
class ToolbarView : public views::AccessiblePaneView,
- public views::MenuButtonDelegate,
+ public views::MenuButtonListener,
public ui::AcceleratorProvider,
public LocationBarView::Delegate,
public content::NotificationObserver,
@@ -86,8 +86,9 @@ class ToolbarView : public views::AccessiblePaneView,
virtual bool SetPaneFocus(View* initial_focus) OVERRIDE;
virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
- // Overridden from views::MenuButtonDelegate:
- virtual void RunMenu(views::View* source, const gfx::Point& pt) OVERRIDE;
+ // Overridden from views::MenuButtonListener:
+ virtual void OnMenuButtonClicked(views::View* source,
+ const gfx::Point& point) OVERRIDE;
// Overridden from LocationBarView::Delegate:
virtual TabContentsWrapper* GetTabContentsWrapper() const OVERRIDE;
@@ -97,9 +98,9 @@ class ToolbarView : public views::AccessiblePaneView,
// Overridden from CommandUpdater::CommandObserver:
virtual void EnabledStateChangedForCommand(int id, bool enabled) OVERRIDE;
- // Overridden from views::BaseButton::ButtonListener:
- virtual void ButtonPressed(views::Button* sender, const views::Event& event)
- OVERRIDE;
+ // Overridden from views::ButtonListener:
+ virtual void ButtonPressed(views::Button* sender,
+ const views::Event& event) OVERRIDE;
// Overridden from content::NotificationObserver:
virtual void Observe(int type,
« no previous file with comments | « chrome/browser/ui/views/tabs/tab_strip.cc ('k') | chrome/browser/ui/views/toolbar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698