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

views/controls/menu/native_menu_win.cc

 // Copyright (c) 2009 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 "views/controls/menu/native_menu_win.h"
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
@@ skipping 45 matching lines @@
     wcex.hbrBackground = reinterpret_cast<HBRUSH>(COLOR_WINDOW+1);
     wcex.lpszClassName = kWindowClassName;
     ATOM clazz = RegisterClassEx(&wcex);
     DCHECK(clazz);
     registered = true;
   }
 
   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);
   }
 
   // Converts the WPARAM value passed to WM_MENUSELECT into an index
   // corresponding to the menu item that was selected.
   int GetMenuItemIndexFromWPARAM(HMENU menu, WPARAM w_param) const {
     int count = GetMenuItemCount(menu);
     // For normal command menu items, Windows passes a command id as the LOWORD
     // of WPARAM for WM_MENUSELECT. We need to walk forward through the menu
     // items to find an item with a matching ID. Ugh!
     for (int i = 0; i < count; ++i) {
       MENUITEMINFO mii = {0};
       mii.cbSize = sizeof(mii);
       mii.fMask = MIIM_ID;
       GetMenuItemInfo(menu, i, MF_BYPOSITION, &mii);
       if (mii.wID == w_param)
         return i;
     }
     // If we didn't find a matching command ID, this means a submenu has been
     // selected instead, and rather than passing a command ID in
     // LOWORD(w_param), Windows has actually passed us a position, so we just
     // return it.
     return w_param;
   }
 
   // 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
   // menu.
   void OnMenuSelect(WPARAM w_param, HMENU menu) {
     if (!menu)
       return;  // menu is null when closing on XP.
 
     int position = GetMenuItemIndexFromWPARAM(menu, w_param);
     if (position >= 0)
@@ skipping 52 matching lines @@
 NativeMenuWin::NativeMenuWin(Menu2Model* model, HWND system_menu_for)
     : model_(model),
       menu_(NULL),
       owner_draw_(false),
       system_menu_for_(system_menu_for),
       first_item_index_(0) {
 }
 
 NativeMenuWin::~NativeMenuWin() {
   STLDeleteContainerPointers(items_.begin(), items_.end());
+  DestroyMenu(menu_);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeMenuWin, MenuWrapper implementation:
 
 void NativeMenuWin::RunMenuAt(const gfx::Point& point, int alignment) {
   CreateHostWindow();
   UpdateStates();
   UINT flags = TPM_LEFTBUTTON | TPM_RECURSE;
   flags |= GetAlignmentFlags(alignment);
@@ skipping 224 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // MenuWrapper, public:
 
 // static
 MenuWrapper* MenuWrapper::CreateWrapper(Menu2* menu) {
   return new NativeMenuWin(menu->model(), NULL);
 }
 
 }  // namespace views