Fix app icon flicker in loading animation

chrome/browser/views/frame/browser_view.cc

 // Copyright (c) 2009 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/browser_view.h"
 
 #if defined(OS_LINUX)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 774 matching lines @@
     contents_split_->Layout();
   }
 }
 
 void BrowserView::SelectedTabExtensionShelfSizeChanged() {
   Layout();
 }
 
 void BrowserView::UpdateTitleBar() {
   frame_->GetWindow()->UpdateWindowTitle();
-  if (ShouldShowWindowIcon())
+  if (ShouldShowWindowIcon() && !loading_animation_timer_.IsRunning())

[Ben Goodger (Google), 2009/11/24 20:54:31]

Does this mean no tab can update its favicon while any other tab is loading?

[xiyuan, 2009/11/24 21:05:05]

Tab's favicon update in tab strip should not be affected. ShouldShowWindowIcon()
is true only for chrome frame window with title bar (i.e. app and pop-up) and
UpdateWindowIcon belows updates the top-left icon for the frame window. The fix
is to skip the window icon set when frame window (GlassBrowserFrameView) uses it
for loading animation.

     frame_->GetWindow()->UpdateWindowIcon();
   browser_extender_->UpdateTitleBar();
 }
 
 void BrowserView::ShelfVisibilityChanged() {
   Layout();
 }
 
 void BrowserView::UpdateDevTools() {
   UpdateDevToolsForContents(GetSelectedTabContents());
@@ skipping 1475 matching lines @@
 
 // static
 FindBar* BrowserWindow::CreateFindBar(Browser* browser) {
   return browser::CreateFindBar(static_cast<BrowserView*>(browser->window()));
 }
 
 // static
 void BrowserList::AllBrowsersClosed() {
   views::Window::CloseAllSecondaryWindows();
 }