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

Unified Diff: ui/views/controls/menu/menu_config.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: Addressed second review 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
Index: ui/views/controls/menu/menu_config.h
diff --git a/ui/views/controls/menu/menu_config.h b/ui/views/controls/menu/menu_config.h
index 7cfd5c0c24fea5efa7b023aaecc17e6bdea9e96a..4a25cdaf81571a46c647f1a7a10c0300ce00aed5 100644
--- a/ui/views/controls/menu/menu_config.h
+++ b/ui/views/controls/menu/menu_config.h
@@ -24,6 +24,14 @@ struct VIEWS_EXPORT MenuConfig {
// Returns the single shared MenuConfig instance, creating if necessary.
static const MenuConfig& instance();
+ // Going forward, every platform will use the new style menu.
sky 2012/08/21 19:36:29 You don't need to get into the specific here, some
Mr4D (OOO till 08-26) 2012/08/21 21:34:54 The TODO makes no sense. As long as there is no co
+ // However - for now only Aura will use it in all situations and the
+ // other OS'es will follow later and should remain as they are. Since this
+ // is of temporary nature this fix changes as little as possible and
+ // determines with this function if the new type or the old type should be
+ // used.
+ static const bool IsNewMenu();
+
// Font used by menus.
gfx::Font font;
@@ -81,9 +89,18 @@ struct VIEWS_EXPORT MenuConfig {
// Width of the gutter. Only used if render_gutter is true.
int gutter_width;
- // Height of the separator.
+ // Height of a normal separator (ui::NORMAL_SEPARATOR).
int separator_height;
+ // Height of a ui::UPPER_SEPARATOR.
+ int separator_upper_height;
+
+ // Height of a ui::LOWER_SEPARATOR.
+ int separator_lower_height;
+
+ // Height of a ui::SPACING_SEPARATOR.
+ int separator_spacing_height;
+
// Whether or not the gutter should be rendered. The gutter is specific to
// Vista.
bool render_gutter;

Powered by Google App Engine
This is Rietveld 408576698