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

Unified Diff: views/controls/button/button_dropdown.h

Issue 126092: Begin to upgrade BackForwardMenuModelViews to use new menu API.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 6 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
Index: views/controls/button/button_dropdown.h
===================================================================
--- views/controls/button/button_dropdown.h (revision 18347)
+++ views/controls/button/button_dropdown.h (working copy)
@@ -7,7 +7,7 @@
#include "base/task.h"
#include "views/controls/button/image_button.h"
-#include "views/controls/menu/menu.h"
+#include "views/controls/menu/menu_2.h"
namespace views {
@@ -21,7 +21,7 @@
////////////////////////////////////////////////////////////////////////////////
class ButtonDropDown : public ImageButton {
public:
- ButtonDropDown(ButtonListener* listener, Menu::Delegate* menu_delegate);
+ ButtonDropDown(ButtonListener* listener, Menu2Model* model);
virtual ~ButtonDropDown();
// Accessibility accessors, overridden from View.
@@ -45,8 +45,9 @@
// Internal function to show the dropdown menu
void ShowDropDownMenu(gfx::NativeView window);
- // Specifies who to delegate populating the menu
- Menu::Delegate* menu_delegate_;
+ // The model that populates the attached menu.
+ Menu2Model* model_;
+ scoped_ptr<Menu2> menu_;
// Y position of mouse when left mouse button is pressed
int y_position_on_lbuttondown_;

Powered by Google App Engine
This is Rietveld 408576698