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

Unified Diff: trunk/src/ui/views/controls/menu/native_menu_win.cc

Issue 14188051: Revert 195033 "views: Fix crash in NativeMenuWin::AddMenuItemAt()." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 8 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ui/views/controls/menu/native_menu_win.cc
===================================================================
--- trunk/src/ui/views/controls/menu/native_menu_win.cc (revision 195256)
+++ trunk/src/ui/views/controls/menu/native_menu_win.cc (working copy)
@@ -627,8 +627,7 @@
ui::MenuModel::ItemType type = model_->GetTypeAt(model_index);
if (type == ui::MenuModel::TYPE_SUBMENU) {
item_data->submenu.reset(
- new NativeMenuWin(model_->GetSubmenuModelAt(model_index),
- system_menu_for_));
+ new NativeMenuWin(model_->GetSubmenuModelAt(model_index), NULL));
mii.fMask |= MIIM_SUBMENU;
mii.hSubMenu = item_data->submenu->GetNativeMenu();
GetNativeMenuWinFromHMENU(mii.hSubMenu)->parent_ = this;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698