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

Unified Diff: app/menus/menu_model.h

Issue 2879002: Reapply r50859 with chromeos fixes. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: add explicit menus:: to chromeos Created 10 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
« no previous file with comments | « app/menus/button_menu_item_model.cc ('k') | app/menus/simple_menu_model.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: app/menus/menu_model.h
diff --git a/app/menus/menu_model.h b/app/menus/menu_model.h
index 50f2e54ca318ee91ef4dfec7d85e09d7c7f2a002..f14c8b5085fca0716e55faca24d54cfa612ef755 100644
--- a/app/menus/menu_model.h
+++ b/app/menus/menu_model.h
@@ -20,6 +20,7 @@ class Font;
namespace menus {
class Accelerator;
+class ButtonMenuItemModel;
// An interface implemented by an object that provides the content of a menu.
class MenuModel {
@@ -32,6 +33,7 @@ class MenuModel {
TYPE_CHECK,
TYPE_RADIO,
TYPE_SEPARATOR,
+ TYPE_BUTTON_ITEM,
TYPE_SUBMENU
};
@@ -85,6 +87,9 @@ class MenuModel {
// is an icon, false otherwise.
virtual bool GetIconAt(int index, SkBitmap* icon) const = 0;
+ // Returns the model for a menu item with a line of buttons at |index|.
+ virtual ButtonMenuItemModel* GetButtonMenuItemAt(int index) const = 0;
+
// Returns the enabled state of the item at the specified index.
virtual bool IsEnabledAt(int index) const = 0;
« no previous file with comments | « app/menus/button_menu_item_model.cc ('k') | app/menus/simple_menu_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698