diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-19 19:48:23 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-19 19:48:23 +0000 |
| commit | 5eafd676f33afdeb5912abf21a0e31fe85c34128 (patch) | |
| tree | 2c2ca651edf025a4741bb88be11e3f6b069be46c | |
| parent | bea9410cb733fe272a50c6f63034d07dbfc0cf09 (diff) | |
| download | chromium_src-5eafd676f33afdeb5912abf21a0e31fe85c34128.zip chromium_src-5eafd676f33afdeb5912abf21a0e31fe85c34128.tar.gz chromium_src-5eafd676f33afdeb5912abf21a0e31fe85c34128.tar.bz2 | |
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
| -rw-r--r-- | ui/views/controls/menu/native_menu_win.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ui/views/controls/menu/native_menu_win.cc b/ui/views/controls/menu/native_menu_win.cc index 1ca5906..a61c9de 100644 --- a/ui/views/controls/menu/native_menu_win.cc +++ b/ui/views/controls/menu/native_menu_win.cc @@ -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; |