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

content/shell/shell_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 "content/shell/shell.h"
 
 #include <windows.h>
 #include <commctrl.h>
 
 #include "base/string_piece.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/resource_util.h"
+#include "base/win/wrapped_window_proc.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/shell/resource.h"
 #include "googleurl/src/gurl.h"
 #include "grit/webkit_resources.h"
 #include "grit/webkit_chromium_resources.h"
 #include "ipc/ipc_message.h"
 #include "net/base/net_module.h"
 #include "ui/base/win/hwnd_util.h"
 
@@ skipping 16 matching lines @@
       : base::StringPiece();
 }
 
 }  // namespace
 
 namespace content {
 
 HINSTANCE Shell::instance_handle_;
 
 void Shell::PlatformInitialize() {
-  instance_handle_ = ::GetModuleHandle(NULL);
-
   INITCOMMONCONTROLSEX InitCtrlEx;
   InitCtrlEx.dwSize = sizeof(INITCOMMONCONTROLSEX);
   InitCtrlEx.dwICC  = ICC_STANDARD_CLASSES;
   InitCommonControlsEx(&InitCtrlEx);
   RegisterWindowClass();
 }
 
 base::StringPiece Shell::PlatformResourceProvider(int key) {
   return GetRawDataResource(::GetModuleHandle(NULL), key);
 }
@@ skipping 122 matching lines @@
 
   MoveWindow(GetContentView(), 0, kURLBarHeight, rc.right,
              rc.bottom - kURLBarHeight, TRUE);
 }
 
 void Shell::Close() {
   DestroyWindow(window_);
 }
 
 ATOM Shell::RegisterWindowClass() {
-  WNDCLASSEX wcex = {
-      sizeof(WNDCLASSEX),
+  WNDCLASSEXW window_class;
+  base::win::InitializeWindowClass(
+      kWindowClass,
+      &Shell::WndProc,
       CS_HREDRAW | CS_VREDRAW,
-      Shell::WndProc,
       0,
       0,
-      instance_handle_,
+      LoadCursor(NULL, IDC_ARROW),
       NULL,
-      LoadCursor(NULL, IDC_ARROW),
-      0,
       MAKEINTRESOURCE(IDC_CONTENTSHELL),
-      kWindowClass,
       NULL,
-    };
-  return RegisterClassEx(&wcex);
+      NULL,
+      &window_class);
+  instance_handle_ = window_class.hInstance;
+  return RegisterClassEx(&window_class);
 }
 
 LRESULT CALLBACK Shell::WndProc(HWND hwnd, UINT message, WPARAM wParam,
                                 LPARAM lParam) {
   Shell* shell = static_cast<Shell*>(ui::GetWindowUserData(hwnd));
 
   switch (message) {
     case WM_COMMAND: {
       int id = LOWORD(wParam);
       switch (id) {
@@ skipping 58 matching lines @@
 
         return 0;
       }
   }
 
   return CallWindowProc(shell->default_edit_wnd_proc_, hwnd, message, wParam,
                         lParam);
 }
 
 }  // namespace content