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

chrome/browser/media_gallery/media_device_notifications_window_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 "chrome/browser/media_gallery/media_device_notifications_window_win.h"
 
 #include <windows.h>
 #include <dbt.h>
 #include <string>
 
@@ skipping 24 matching lines @@
     return dev_broadcast_volume->dbcv_unitmask;
   }
   return 0;
 }
 
 }  // namespace
 
 namespace chrome {
 
 MediaDeviceNotificationsWindowWin::MediaDeviceNotificationsWindowWin()
-    : volume_name_func_(&GetVolumeName) {
+    : atom_(0),
+      instance_(NULL),
+      window_(NULL),
+      volume_name_func_(&GetVolumeName) {
   Init();
 }
 
 MediaDeviceNotificationsWindowWin::MediaDeviceNotificationsWindowWin(
-    VolumeNameFunc volume_name_func) : volume_name_func_(volume_name_func) {
+    VolumeNameFunc volume_name_func)
+    : atom_(0),
+      instance_(NULL),
+      window_(NULL),
+      volume_name_func_(volume_name_func) {
   Init();
 }
 
 void MediaDeviceNotificationsWindowWin::Init() {
-  HINSTANCE hinst = GetModuleHandle(NULL);
+  WNDCLASSEX window_class;
+  base::win::InitializeWindowClass(
+      WindowClassName,
+      &base::win::WrappedWindowProc<
+          MediaDeviceNotificationsWindowWin::WndProcThunk>,
+      0, 0, 0, NULL, NULL, NULL, NULL, NULL,
+      &window_class);
+  instance_ = window_class.hInstance;
+  atom_ = RegisterClassEx(&window_class);
+  DCHECK(atom_);
 
-  WNDCLASSEX wc = {0};
-  wc.cbSize = sizeof(wc);
-  wc.lpfnWndProc = base::win::WrappedWindowProc<
-      &MediaDeviceNotificationsWindowWin::WndProcThunk>;
-  wc.hInstance = hinst;
-  wc.lpszClassName = WindowClassName;
-  ATOM clazz = RegisterClassEx(&wc);
-  DCHECK(clazz);
-
-  window_ = CreateWindow(WindowClassName, 0, 0, 0, 0, 0, 0, 0, 0, hinst, 0);
+  window_ = CreateWindow(MAKEINTATOM(atom_), 0, 0, 0, 0, 0, 0, 0, 0, instance_,
+                         0);
   SetWindowLongPtr(window_, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(this));
 }
 
 MediaDeviceNotificationsWindowWin::~MediaDeviceNotificationsWindowWin() {
-  if (window_) {
+  if (window_)
     DestroyWindow(window_);
-    UnregisterClass(WindowClassName, GetModuleHandle(NULL));
-  }
+
+  if (atom_)
+    UnregisterClass(MAKEINTATOM(atom_), instance_);
 }
 
 LRESULT MediaDeviceNotificationsWindowWin::OnDeviceChange(UINT event_type,
                                                           DWORD data) {
   base::SystemMonitor* monitor = base::SystemMonitor::Get();
   switch (event_type) {
     case DBT_DEVICEARRIVAL: {
       DWORD unitmask = GetVolumeBitMaskFromBroadcastHeader(data);
       for (int i = 0; unitmask; ++i, unitmask >>= 1) {
         if (unitmask & 0x01) {
@@ skipping 42 matching lines @@
     LPARAM lparam) {
   MediaDeviceNotificationsWindowWin* msg_wnd =
       reinterpret_cast<MediaDeviceNotificationsWindowWin*>(
           GetWindowLongPtr(hwnd, GWLP_USERDATA));
   if (msg_wnd)
     return msg_wnd->WndProc(hwnd, message, wparam, lparam);
   return ::DefWindowProc(hwnd, message, wparam, lparam);
 }
 
 }  // namespace chrome