Tab audio indicator tweaks

chrome/browser/ui/views/tabs/tab.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 "chrome/browser/ui/views/tabs/tab.h"
 
 #include <limits>
 
 #include "base/command_line.h"
 #include "base/debug/alias.h"
@@ skipping 1408 matching lines @@
                        resized_icon.height(),
                        resized_bounds, true, SkPaint());
 
         ui::ThemeProvider* tp = GetThemeProvider();
         gfx::ImageSkia projection_screen(
             *tp->GetImageSkiaNamed(IDR_TAB_CAPTURE));
         DrawIconCenter(canvas, projection_screen, 0,
                        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);
       }
     }
   }
   canvas->Restore();
 
   // Paint recording or projecting animation overlay.
   if (data().capture_state != TabRendererData::CAPTURE_STATE_NONE)
     PaintCaptureState(canvas, bounds);
 }
 
@@ skipping 352 matching lines @@
                          const gfx::ImageSkia& image) {
   DCHECK_NE(scale_factor, ui::SCALE_FACTOR_NONE);
   ImageCacheEntry entry;
   entry.resource_id = resource_id;
   entry.scale_factor = scale_factor;
   entry.image = image;
   image_cache_->push_front(entry);
   if (image_cache_->size() > kMaxImageCacheSize)
     image_cache_->pop_back();
 }