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

chrome/browser/ui/views/status_icons/status_tray_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/ui/views/status_icons/status_tray_win.h"
 
 #include "base/win/wrapped_window_proc.h"
 #include "chrome/browser/ui/views/status_icons/status_icon_win.h"
 #include "chrome/common/chrome_constants.h"
 #include "ui/base/win/hwnd_util.h"
 #include "ui/gfx/screen.h"
 
 static const UINT kStatusIconMessage = WM_APP + 1;
 
 StatusTrayWin::StatusTrayWin()
-    : next_icon_id_(1) {
+    : next_icon_id_(1),
+      atom_(0),
+      instance_(NULL),
+      window_(NULL) {
   // Register our window class
-  HINSTANCE hinst = GetModuleHandle(NULL);
-  WNDCLASSEX wc = {0};
-  wc.cbSize = sizeof(wc);
-  wc.lpfnWndProc = base::win::WrappedWindowProc<StatusTrayWin::WndProcStatic>;
-  wc.hInstance = hinst;
-  wc.lpszClassName = chrome::kStatusTrayWindowClass;
-  ATOM clazz = RegisterClassEx(&wc);
-  DCHECK(clazz);
+  WNDCLASSEX window_class;
+  base::win::InitializeWindowClass(
+      chrome::kStatusTrayWindowClass,
+      &base::win::WrappedWindowProc<StatusTrayWin::WndProcStatic>,
+      0, 0, 0, NULL, NULL, NULL, NULL, NULL,
+      &window_class);
+  instance_ = window_class.hInstance;
+  atom_ = RegisterClassEx(&window_class);
+  CHECK(atom_);
 
   // If the taskbar is re-created after we start up, we have to rebuild all of
   // our icons.
   taskbar_created_message_ = RegisterWindowMessage(TEXT("TaskbarCreated"));
 
   // Create an offscreen window for handling messages for the status icons. We
   // create a hidden WS_POPUP window instead of an HWND_MESSAGE window, because
   // only top-level windows such as popups can receive broadcast messages like
   // "TaskbarCreated".
-  window_ = CreateWindow(chrome::kStatusTrayWindowClass,
-                         0, WS_POPUP, 0, 0, 0, 0, 0, 0, hinst, 0);
+  window_ = CreateWindow(MAKEINTATOM(atom_),
+                         0, WS_POPUP, 0, 0, 0, 0, 0, 0, instance_, 0);
   ui::CheckWindowCreated(window_);
   ui::SetWindowUserData(window_, this);
 }
 
 LRESULT CALLBACK StatusTrayWin::WndProcStatic(HWND hwnd,
                                               UINT message,
                                               WPARAM wparam,
                                               LPARAM lparam) {
   StatusTrayWin* msg_wnd = reinterpret_cast<StatusTrayWin*>(
       GetWindowLongPtr(hwnd, GWLP_USERDATA));
@@ skipping 34 matching lines @@
         }
         return TRUE;
     }
   }
   return ::DefWindowProc(hwnd, message, wparam, lparam);
 }
 
 StatusTrayWin::~StatusTrayWin() {
   if (window_)
     DestroyWindow(window_);
-  UnregisterClass(chrome::kStatusTrayWindowClass, GetModuleHandle(NULL));
+
+  if (atom_)
+    UnregisterClass(MAKEINTATOM(atom_), instance_);
 }
 
 StatusIcon* StatusTrayWin::CreatePlatformStatusIcon() {
   return new StatusIconWin(next_icon_id_++, window_, kStatusIconMessage);
 }
 
 StatusTray* StatusTray::Create() {
   return new StatusTrayWin();
 }