Remove the Menu object, converting all the remaining callers to use Menu2. I'...

views/controls/menu/native_menu_win.cc

Index: views/controls/menu/native_menu_win.cc
===================================================================
--- views/controls/menu/native_menu_win.cc	(revision 18306)
+++ views/controls/menu/native_menu_win.cc	(working copy)
@@ -63,7 +63,7 @@
   NativeMenuWin* GetNativeMenuWinFromHMENU(HMENU hmenu) const {
     MENUINFO mi = {0};
     mi.cbSize = sizeof(mi);
-    mi.fMask = MIM_MENUDATA;
+    mi.fMask = MIM_MENUDATA | MIM_STYLE;
     GetMenuInfo(hmenu, &mi);
     return reinterpret_cast<NativeMenuWin*>(mi.dwMenuData);
   }
@@ -92,7 +92,9 @@
 
   // Called when the user selects a specific item.
   void OnMenuCommand(int position, HMENU menu) {
-    GetNativeMenuWinFromHMENU(menu)->model_->ActivatedAt(position);
+    NativeMenuWin* intergoat = GetNativeMenuWinFromHMENU(menu);
+    Menu2Model* model = intergoat->model_;
+    model->ActivatedAt(position);
   }
 
   // Called as the user moves their mouse or arrows through the contents of the
@@ -165,6 +167,7 @@
 
 NativeMenuWin::~NativeMenuWin() {
   STLDeleteContainerPointers(items_.begin(), items_.end());
+  DestroyMenu(menu_);
 }
 
 ////////////////////////////////////////////////////////////////////////////////