Added base::win::InitializeWindowClass() wrapper to make sure that window classes are properly asso…

ui/views/controls/menu/native_menu_win.cc

 // Copyright (c) 2012 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 "ui/views/controls/menu/native_menu_win.h"
 
 #include <Windowsx.h>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 78 matching lines @@
   HWND hwnd() const { return hwnd_; }
 
  private:
   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 = 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;
   }
 
   // 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!
@@ skipping 624 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // MenuWrapper, public:
 
 // static
 MenuWrapper* MenuWrapper::CreateWrapper(ui::MenuModel* model) {
   return new NativeMenuWin(model, NULL);
 }
 
 }  // namespace views