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

Unified Diff: ui/views/controls/menu/menu_item_view.h

Issue 10837317: Setting the touch wrench menu as default menu for ChromeOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: And another merge! Created 8 years, 4 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/menu/menu_config_views.cc ('k') | ui/views/controls/menu/menu_item_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/menu/menu_item_view.h
diff --git a/ui/views/controls/menu/menu_item_view.h b/ui/views/controls/menu/menu_item_view.h
index c80a1d3b38db280d8d6bccee66b8c27e39769f81..bbe258ce8c48887cfa00eca394b9efb857eba976 100644
--- a/ui/views/controls/menu/menu_item_view.h
+++ b/ui/views/controls/menu/menu_item_view.h
@@ -12,6 +12,7 @@
#include "base/logging.h"
#include "base/string16.h"
#include "build/build_config.h"
+#include "ui/base/models/menu_separator_types.h"
#include "ui/gfx/image/image_skia.h"
#include "ui/views/view.h"
@@ -133,7 +134,8 @@ class VIEWS_EXPORT MenuItemView : public View {
int item_id,
const string16& label,
const gfx::ImageSkia& icon,
- Type type);
+ Type type,
+ ui::MenuSeparatorType separator_style);
// Remove an item from the menu at a specified index.
// ChildrenChanged() should be called after removing menu items (whether
@@ -193,7 +195,8 @@ class VIEWS_EXPORT MenuItemView : public View {
MenuItemView* AppendMenuItemImpl(int item_id,
const string16& label,
const gfx::ImageSkia& icon,
- Type type);
+ Type type,
+ ui::MenuSeparatorType separator_style);
// Returns the view that contains child menu items. If the submenu has
// not been creates, this creates it.
« no previous file with comments | « ui/views/controls/menu/menu_config_views.cc ('k') | ui/views/controls/menu/menu_item_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698