Chromium Code Reviews| Index: ui/views/controls/menu/native_menu_win.cc |
| diff --git a/ui/views/controls/menu/native_menu_win.cc b/ui/views/controls/menu/native_menu_win.cc |
| index 7df8c8cf379aa4ce864041cd2a8e0f5816537ea0..7c53ded5d26e0fb4d58434893d7a60814079b09a 100644 |
| --- a/ui/views/controls/menu/native_menu_win.cc |
| +++ b/ui/views/controls/menu/native_menu_win.cc |
| @@ -96,13 +96,20 @@ class NativeMenuWin::MenuHostWindow { |
| if (registered) |
| return; |
| - WNDCLASSEX wcex = {0}; |
| - wcex.cbSize = sizeof(WNDCLASSEX); |
| - wcex.style = CS_DBLCLKS; |
| - wcex.lpfnWndProc = base::win::WrappedWindowProc<&MenuHostWindowProc>; |
| - wcex.hbrBackground = reinterpret_cast<HBRUSH>(COLOR_WINDOW+1); |
| - wcex.lpszClassName = kWindowClassName; |
| - ATOM clazz = RegisterClassEx(&wcex); |
| + WNDCLASSEX window_class; |
| + base::win::InitializeWindowClass( |
| + kWindowClassName, |
| + &base::win::WrappedWindowProc<MenuHostWindowProc>, |
| + CS_DBLCLKS, |
| + 0, |
| + 0, |
| + NULL, |
| + reinterpret_cast<HBRUSH>(COLOR_WINDOW+1), |
| + NULL, |
| + NULL, |
| + NULL, |
| + &window_class); |
| + ATOM clazz = RegisterClassEx(&window_class); |
| DCHECK(clazz); |
|
sky
2012/05/09 04:09:25
Make this a CHECK, otherwise we're going to fail.
alexeypa (please no reviews)
2012/05/09 16:56:52
Done.
|
| registered = true; |
| } |