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

Unified Diff: ui/views/controls/menu/menu_config.cc

Issue 11026076: Added MenuConfig setter to MenuItemView, updated rest of the code to use set MenuConfig if it avail… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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.h ('k') | ui/views/controls/menu/menu_config_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/menu/menu_config.cc
diff --git a/ui/views/controls/menu/menu_config.cc b/ui/views/controls/menu/menu_config.cc
index 8cd3a8fdeff709a166b1cf6aa8150c7642975a46..4b3cfbe47c720f8d1789fcbd050ccf3146858b1a 100644
--- a/ui/views/controls/menu/menu_config.cc
+++ b/ui/views/controls/menu/menu_config.cc
@@ -51,6 +51,7 @@ MenuConfig::MenuConfig()
item_top_margin = item_no_icon_top_margin = 12;
item_bottom_margin = item_no_icon_bottom_margin = 13;
}
+ Init();
}
MenuConfig::~MenuConfig() {}
@@ -63,7 +64,7 @@ void MenuConfig::Reset() {
// static
const MenuConfig& MenuConfig::instance() {
if (!config_instance)
- config_instance = Create();
+ config_instance = new MenuConfig();
return *config_instance;
}
« no previous file with comments | « ui/views/controls/menu/menu_config.h ('k') | ui/views/controls/menu/menu_config_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698