summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorxiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-24 22:22:51 +0000
committerxiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-24 22:22:51 +0000
commitc91febb8b30b144e1742e1a9879fba95b326af62 (patch)
tree362a847db0b912c6d8d7fc5b079a7b6097910b9b /chrome/browser
parentc2b7d7875f7e9e9cb6b266297072f17f297a624c (diff)
downloadchromium_src-c91febb8b30b144e1742e1a9879fba95b326af62.zip
chromium_src-c91febb8b30b144e1742e1a9879fba95b326af62.tar.gz
chromium_src-c91febb8b30b144e1742e1a9879fba95b326af62.tar.bz2
Fix app icon flicker in loading animation
The flicker is caused by setting window title icon while a loading animation is in progress. Fix the problem by skipping window icon update when loading animation is running. BUG=15782 TEST=Verify no flicker while web app loads per Ben's comments. Review URL: http://codereview.chromium.org/436028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32982 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/views/frame/browser_view.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
index 8fbd80d..dad49bb 100644
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -792,7 +792,7 @@ void BrowserView::SelectedTabExtensionShelfSizeChanged() {
void BrowserView::UpdateTitleBar() {
frame_->GetWindow()->UpdateWindowTitle();
- if (ShouldShowWindowIcon())
+ if (ShouldShowWindowIcon() && !loading_animation_timer_.IsRunning())
frame_->GetWindow()->UpdateWindowIcon();
browser_extender_->UpdateTitleBar();
}