Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(239)

Unified Diff: chrome/browser/ui/views/tabs/tab.cc

Issue 13055002: Tab audio indicator tweaks (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/tabs/tab_audio_indicator_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/tabs/tab.cc
diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc
index 33625dbc732997a32d12734db6ccefba91388e57..5944a8447b2b46b7a2e9da710f902951060ebd14 100644
--- a/chrome/browser/ui/views/tabs/tab.cc
+++ b/chrome/browser/ui/views/tabs/tab.cc
@@ -1426,16 +1426,18 @@ void Tab::PaintIcon(gfx::Canvas* canvas) {
data().favicon.width(),
data().favicon.height(),
bounds, true, SkPaint());
+ } else if (!icon_animation_ && tab_audio_indicator_->IsAnimating()) {
+ // Draw the audio indicator UI only if no other icon animation is
+ // active.
+ if (!icon_animation_ && tab_audio_indicator_->IsAnimating()) {
+ tab_audio_indicator_->set_favicon(data().favicon);
+ tab_audio_indicator_->Paint(canvas, bounds);
+ }
} else {
DrawIconCenter(canvas, data().favicon, 0,
data().favicon.width(),
data().favicon.height(),
bounds, true, SkPaint());
-
- // Draw the audio indicator UI only if no other icon animation is
- // active.
- if (!icon_animation_ && tab_audio_indicator_->IsAnimating())
- tab_audio_indicator_->Paint(canvas, bounds);
}
}
}
« no previous file with comments | « chrome/browser/ui/tabs/tab_audio_indicator_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698