Add an exception wrapper to the WindowProc functions so...

views/controls/menu/native_menu_win.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "base/logging.h"
 #include "base/stl_util-inl.h"
+#include "base/win/wrapped_window_proc.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/base/win/hwnd_util.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/font.h"
 #include "views/accelerator.h"
 #include "views/controls/menu/menu_2.h"
 
@@ skipping 50 matching lines @@
   static const wchar_t* kWindowClassName;
 
   void RegisterClass() {
     static bool registered = false;
     if (registered)
       return;
 
     WNDCLASSEX wcex = {0};
     wcex.cbSize = sizeof(WNDCLASSEX);
     wcex.style = CS_DBLCLKS;
-    wcex.lpfnWndProc = &MenuHostWindowProc;
+    wcex.lpfnWndProc = base::win::WrappedWindowProc<&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);
@@ skipping 540 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // MenuWrapper, public:
 
 // static
 MenuWrapper* MenuWrapper::CreateWrapper(Menu2* menu) {
   return new NativeMenuWin(menu->model(), NULL);
 }
 
 }  // namespace views