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

trunk/src/ui/views/controls/menu/native_menu_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/controls/menu/native_menu_win.h"
 
 #include <Windowsx.h>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 609 matching lines @@
   if (!owner_draw_)
     mii.fType = MFT_STRING;
   else
     mii.fType = MFT_OWNERDRAW;
 
   ItemData* item_data = new ItemData;
   item_data->label = string16();
   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;
   } else {
     if (type == ui::MenuModel::TYPE_RADIO)
       mii.fType |= MFT_RADIOCHECK;
     mii.wID = model_->GetCommandIdAt(model_index);
   }
   item_data->native_menu_win = this;
   item_data->model_index = model_index;
@@ skipping 104 matching lines @@
 
 void NativeMenuWin::CreateHostWindow() {
   // This only gets called from RunMenuAt, and as such there is only ever one
   // host window per menu hierarchy, no matter how many NativeMenuWin objects
   // exist wrapping submenus.
   if (!host_window_.get())
     host_window_.reset(new MenuHostWindow(this));
 }
 
 }  // namespace views