Merge 131673 - Make WindowImpl take into account the icon in the class registrar.

ui/base/win/window_impl.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/base/win/window_impl.h"
 
 #include <list>
 
 #include "base/memory/singleton.h"
 #include "base/string_number_conversions.h"
@@ skipping 11 matching lines @@
 // WindowImpl class tracking.
 
 // Several external scripts rely explicitly on this base class name for
 // acquiring the window handle and will break if this is modified!
 // static
 const wchar_t* const WindowImpl::kBaseClassName = L"Chrome_WidgetWin_";
 
 // WindowImpl class information used for registering unique windows.
 struct ClassInfo {
   UINT style;
-  HBRUSH background;
+  HICON icon;
 
-  explicit ClassInfo(int style)
+  ClassInfo(int style, HICON icon)
       : style(style),
-        background(NULL) {}
+        icon(icon) {}
 
   // Compares two ClassInfos. Returns true if all members match.
   bool Equals(const ClassInfo& other) const {
-    return (other.style == style && other.background == background);
+    return (other.style == style && other.icon == icon);
   }
 };
 
 class ClassRegistrar {
  public:
   static ClassRegistrar* GetInstance() {
     return Singleton<ClassRegistrar>::get();
   }
 
   ~ClassRegistrar() {
@@ skipping 139 matching lines @@
 
   WindowImpl* window = reinterpret_cast<WindowImpl*>(
       ui::GetWindowUserData(hwnd));
   if (!window)
     return 0;
 
   return window->OnWndProc(message, w_param, l_param);
 }
 
 std::wstring WindowImpl::GetWindowClassName() {
-  ClassInfo class_info(initial_class_style());
+  HICON icon = GetDefaultWindowIcon();
+  ClassInfo class_info(initial_class_style(), icon);
   std::wstring name;
   if (ClassRegistrar::GetInstance()->RetrieveClassName(class_info, &name))
     return name;
 
-  HICON icon = GetDefaultWindowIcon();
-
   // No class found, need to register one.
+  HBRUSH background = NULL;
   WNDCLASSEX class_ex = {
     sizeof(WNDCLASSEX),
     class_info.style,
     base::win::WrappedWindowProc<&WindowImpl::WndProc>,
     0,
     0,
     NULL,
     icon,
     NULL,
-    reinterpret_cast<HBRUSH>(class_info.background + 1),
+    reinterpret_cast<HBRUSH>(background + 1),
     NULL,
     name.c_str(),
     icon
   };
   ATOM atom = RegisterClassEx(&class_ex);
   CHECK(atom) << GetLastError();
 
   ClassRegistrar::GetInstance()->RegisterClass(class_info, name, atom);
 
   return name;
 }
 
 }  // namespace ui