Fix issue 29996

chrome/browser/views/frame/glass_browser_frame_view.cc

 // Copyright (c) 2010 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/views/frame/glass_browser_frame_view.h"
 
 #include "app/gfx/canvas.h"
+#include "app/gfx/icon_util.h"
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser_theme_provider.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/tabs/side_tab_strip.h"
 #include "chrome/browser/views/tabs/tab_strip.h"
 #include "grit/app_resources.h"
 #include "grit/theme_resources.h"
 #include "views/window/client_view.h"
@@ skipping 386 matching lines @@
     SendMessage(frame_->GetWindow()->GetNativeWindow(), WM_SETICON,
                 static_cast<WPARAM>(ICON_SMALL),
                 reinterpret_cast<LPARAM>(throbber_icons_[throbber_frame_]));
   }
 }
 
 void GlassBrowserFrameView::StopThrobber() {
   if (throbber_running_) {
     throbber_running_ = false;
 
+    HICON frame_icon = NULL;
+
+    // Check if hosted BrowserView has a window icon to use.
+    if (browser_view_->ShouldShowWindowIcon()) {
+      SkBitmap icon = browser_view_->GetWindowIcon();
+      if (!icon.isNull())
+        frame_icon = IconUtil::CreateHICONFromSkBitmap(icon);
+    }
+
+    // Fallback to class icon.
+    if (!frame_icon) {
+      frame_icon = reinterpret_cast<HICON>(GetClassLongPtr(
+          frame_->GetWindow()->GetNativeWindow(), GCLP_HICONSM));
+    }
+
     // This will reset the small icon which we set in the throbber code.
-    // Windows will then pick up the default icon from the window class.
+    // WM_SETICON with NULL icon restores the icon for title bar but not
+    // for taskbar. See http://crbug.com/29996
     SendMessage(frame_->GetWindow()->GetNativeWindow(), WM_SETICON,
-                static_cast<WPARAM>(ICON_SMALL), NULL);
+                static_cast<WPARAM>(ICON_SMALL),
+                reinterpret_cast<LPARAM>(frame_icon));
   }
 }
 
 void GlassBrowserFrameView::DisplayNextThrobberFrame() {
   throbber_frame_ = (throbber_frame_ + 1) % kThrobberIconCount;
   SendMessage(frame_->GetWindow()->GetNativeWindow(), WM_SETICON,
               static_cast<WPARAM>(ICON_SMALL),
               reinterpret_cast<LPARAM>(throbber_icons_[throbber_frame_]));
 }
 
@@ skipping 15 matching lines @@
   static bool initialized = false;
   if (!initialized) {
 #if defined(GOOGLE_CHROME_BUILD)
     distributor_logo_ = ResourceBundle::GetSharedInstance().
         GetBitmapNamed(IDR_DISTRIBUTOR_LOGO);
 #endif
 
     initialized = true;
   }
 }