diff options
| author | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-17 00:34:09 +0000 |
|---|---|---|
| committer | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-17 00:34:09 +0000 |
| commit | ecb924c963706ef0c1c7bf149f8e74736272c442 (patch) | |
| tree | b85a0476a31c34e2089663f0e8128fcf31f55406 /views/controls | |
| parent | a7bdff4fae714f46cc7e0b9f5fbc61bbf849c876 (diff) | |
| download | chromium_src-ecb924c963706ef0c1c7bf149f8e74736272c442.zip chromium_src-ecb924c963706ef0c1c7bf149f8e74736272c442.tar.gz chromium_src-ecb924c963706ef0c1c7bf149f8e74736272c442.tar.bz2 | |
Add an exception wrapper to the WindowProc functions so
that we receive crash reports when something goes wrong.
BUG=63702
TEST=base_unittests
Review URL: http://codereview.chromium.org/6697004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78475 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls')
| -rw-r--r-- | views/controls/menu/native_menu_win.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/views/controls/menu/native_menu_win.cc b/views/controls/menu/native_menu_win.cc index 9eabf46..f639a2e 100644 --- a/views/controls/menu/native_menu_win.cc +++ b/views/controls/menu/native_menu_win.cc @@ -1,4 +1,4 @@ -// 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. @@ -6,6 +6,7 @@ #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" @@ -76,7 +77,7 @@ class NativeMenuWin::MenuHostWindow { 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); |