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

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

Issue 10837317: Setting the touch wrench menu as default menu for ChromeOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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_item_view.cc
diff --git a/ui/views/controls/menu/menu_item_view.cc b/ui/views/controls/menu/menu_item_view.cc
index f89648cd4d3a5f28e11378d5f9c62845d1ac6b48..84038e034b0870dce858bdd389ea9fac3e635089 100644
--- a/ui/views/controls/menu/menu_item_view.cc
+++ b/ui/views/controls/menu/menu_item_view.cc
@@ -216,7 +216,7 @@ MenuItemView* MenuItemView::AddMenuItemAt(int index,
CreateSubmenu();
DCHECK_GE(submenu_->child_count(), index);
if (type == SEPARATOR) {
- submenu_->AddChildViewAt(new MenuSeparator(), index);
+ submenu_->AddChildViewAt(new MenuSeparator(label), index);
return NULL;
}
MenuItemView* item = new MenuItemView(this, item_id, type);
@@ -306,6 +306,8 @@ MenuItemView* MenuItemView::AppendMenuItemFromModel(ui::MenuModel* model,
break;
case ui::MenuModel::TYPE_SEPARATOR:
type = MenuItemView::SEPARATOR;
+ // This can be one of the separator styles.
+ label = model->GetLabelAt(index);
break;
case ui::MenuModel::TYPE_SUBMENU:
model->GetIconAt(index, &icon);

Powered by Google App Engine
This is Rietveld 408576698