Commit 5eafd676 authored by msw@chromium.org's avatar msw@chromium.org

Revert 195033 "views: Fix crash in NativeMenuWin::AddMenuItemAt()."

Crashes still occur, I'm reverting this and http://crrev.com/194356 

https://chromecrash.corp.google.com/browse?q=product.name%3D'Chrome'%20AND%20product.version%3D'28.0.1483.0'%20AND%20custom_data.ChromeCrashProto.ptype%3D'browser'%20AND%20custom_data.ChromeCrashProto.magic_signature_1.name%3D'views%3A%3ANativeMenuWin%3A%3AAddMenuItemAt

> views: Fix crash in NativeMenuWin::AddMenuItemAt().
> 
> BUG=233243
> R=msw@chromium.org
> TBR=ben@chromium.org
> 
> Review URL: https://codereview.chromium.org/14267007

TBR=tfarina@chromium.org

Review URL: https://codereview.chromium.org/14188051

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195257 0039d316-1c4b-4281-b951-d872f2087c98
parent bea9410c
......@@ -627,8 +627,7 @@ void NativeMenuWin::AddMenuItemAt(int menu_index, int model_index) {
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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment