Fix regression in submenus not working.

views/controls/menu/native_menu_win.cc

 // Copyright (c) 2010 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/message_loop.h"
@@ skipping 70 matching lines @@
     wcex.cbSize = sizeof(WNDCLASSEX);
     wcex.style = CS_DBLCLKS;
     wcex.lpfnWndProc = &MenuHostWindowProc;
     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 | 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;
   }
 
   NativeMenuWin::ItemData* GetItemData(ULONG_PTR item_data) {
     return reinterpret_cast<NativeMenuWin::ItemData*>(item_data);
   }
 
   // Called when the user selects a specific item.
   void OnMenuCommand(int position, HMENU menu) {
-    parent_->model_->ActivatedAt(position);
+    NativeMenuWin* intergoat = GetNativeMenuWinFromHMENU(menu);

[asargent_no_longer_on_chrome, 2011/01/20 19:56:57]

Does the name "intergoat" actually mean something in some idiom I'm not familiar
with, or does it somehow derive from the "goats teleported" column of the task
manager? :)

[jam, 2011/01/20 20:24:30]

I think it's an inside joke :)  This is just resurrecting code that I deleted in
my earlier change.

+    ui::MenuModel* 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)
-      parent_->model_->HighlightChangedTo(position);
+      GetNativeMenuWinFromHMENU(menu)->model_->HighlightChangedTo(position);
   }
 
   // Called by Windows to measure the size of an owner-drawn menu item.
   void OnMeasureItem(WPARAM w_param, MEASUREITEMSTRUCT* measure_item_struct) {
     NativeMenuWin::ItemData* data = GetItemData(measure_item_struct->itemData);
     if (data) {
       gfx::Font font;
       measure_item_struct->itemWidth = font.GetStringWidth(data->label) +
           kIconWidth + kItemLeftMargin + kItemRightMargin -
           GetSystemMetrics(SM_CXMENUCHECK);
@@ skipping 493 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // MenuWrapper, public:
 
 // static
 MenuWrapper* MenuWrapper::CreateWrapper(Menu2* menu) {
   return new NativeMenuWin(menu->model(), NULL);
 }
 
 }  // namespace views