Revert 183977

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 492 matching lines @@
       // switches to them.  Don't display animations for these unless they're
       // selected (i.e. in the foreground) -- we won't reload these
       // automatically since we don't want to get into a crash loop.
       if (IsSelected() ||
           data_.crashed_status != base::TERMINATION_STATUS_PROCESS_WAS_KILLED)
         StartCrashAnimation();
 #else
       StartCrashAnimation();
 #endif
     }
+
   } else if ((data_.capture_state == TabRendererData::CAPTURE_STATE_NONE) &&
              (old.capture_state != TabRendererData::CAPTURE_STATE_NONE)) {
     StopRecordingAnimation();
+
   } else if ((data_.capture_state != TabRendererData::CAPTURE_STATE_NONE) &&
              (old.capture_state == TabRendererData::CAPTURE_STATE_NONE)) {
     StartRecordingAnimation();
-  } else if ((data_.audio_state == TabRendererData::AUDIO_STATE_NONE) &&
-             (old.audio_state != TabRendererData::AUDIO_STATE_NONE)) {
-    StopAudioPlayingAnimation();
-  } else if ((data_.audio_state != TabRendererData::AUDIO_STATE_NONE) &&
-             (old.audio_state == TabRendererData::AUDIO_STATE_NONE)) {
-    StartAudioPlayingAnimation();
+
   } else {
     if (IsPerformingCrashAnimation())
       StopCrashAnimation();
     ResetCrashedFavicon();
   }
 
   if (old.mini != data_.mini) {
     if (tab_animation_.get() && tab_animation_->is_animating()) {
       tab_animation_->Stop();
       tab_animation_.reset(NULL);
@@ skipping 826 matching lines @@
   // Paint network activity (aka throbber) animation frame.
   if (data().network_state != TabRendererData::NETWORK_STATE_NONE) {
     ui::ThemeProvider* tp = GetThemeProvider();
     gfx::ImageSkia frames(*tp->GetImageSkiaNamed(
         (data().network_state == TabRendererData::NETWORK_STATE_WAITING) ?
         IDR_THROBBER_WAITING : IDR_THROBBER));
 
     int icon_size = frames.height();
     int image_offset = loading_animation_frame_ * icon_size;
     DrawIconCenter(canvas, frames, image_offset,
-                   icon_size, icon_size,
-                   bounds, false, SkPaint());
+                   icon_size, icon_size, bounds, false, SkPaint());
     return;
   }
 
   // Paint regular icon and potentially overlays.
   canvas->Save();
   canvas->ClipRect(GetLocalBounds());
   if (should_display_crashed_favicon_) {
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     gfx::ImageSkia crashed_favicon(*rb.GetImageSkiaNamed(IDR_SAD_FAVICON));
     bounds.set_y(bounds.y() + favicon_hiding_offset_);
     DrawIconCenter(canvas, crashed_favicon, 0,
                     crashed_favicon.width(),
-                    crashed_favicon.height(),
-                    bounds, true, SkPaint());
+                    crashed_favicon.height(), bounds, true, SkPaint());
   } else {
     if (!data().favicon.isNull()) {
       if (data().capture_state == TabRendererData::CAPTURE_STATE_PROJECTING) {
         // If projecting, shrink favicon and add projection screen instead.
         gfx::ImageSkia resized_icon =
             gfx::ImageSkiaOperations::CreateResizedImage(
                 data().favicon,
                 skia::ImageOperations::RESIZE_BEST,
                 gfx::Size(data().favicon.width() *
                           kProjectingFaviconResizeScale,
                           data().favicon.height() *
                           kProjectingFaviconResizeScale));
 
         gfx::Rect resized_bounds(bounds);
         // Need to shift it up a bit vertically because the projection screen
         // is thinner on the top and bottom.
         resized_bounds.set_y(resized_bounds.y() - 1);
 
         DrawIconCenter(canvas, resized_icon, 0,
-                       resized_icon.width(),
-                       resized_icon.height(),
-                       resized_bounds, true, SkPaint());
+                        resized_icon.width(),
+                        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());
+                        data().favicon.width(),
+                        data().favicon.height(),
+                        bounds, true, SkPaint());
       } else {
+        // TODO(pkasting): Use code in tab_icon_view.cc:PaintIcon() (or switch
+        // to using that class to render the favicon).
         DrawIconCenter(canvas, data().favicon, 0,
-                       data().favicon.width(),
-                       data().favicon.height(),
-                       bounds, true, SkPaint());
-
-        if (data().audio_state == TabRendererData::AUDIO_STATE_PLAYING) {
-          // If audio is playing, we draw on top of the icon the
-          // current equalizer animiation frame.
-          ui::ThemeProvider* tp = GetThemeProvider();
-          gfx::ImageSkia equalizer(*tp->GetImageSkiaNamed(IDR_AUDIO_ANIMATION));
-          int icon_size = equalizer.height();
-          int number_of_frames = equalizer.width() / icon_size;
-          int frame = static_cast<int>(
-              icon_animation_->GetCurrentValue() * number_of_frames);
-          int image_offset = frame * icon_size;
-          DrawIconAtLocation(canvas, equalizer, image_offset,
-                             bounds.x(), bounds.y() + 1,
-                             icon_size, icon_size,
-                             false, SkPaint());
-        }
+                        data().favicon.width(),
+                        data().favicon.height(),
+                        bounds, true, SkPaint());
       }
     }
   }
   canvas->Restore();
 
   // Paint recording or projecting animation overlay.
   if (data().capture_state != TabRendererData::CAPTURE_STATE_NONE) {
     SkPaint paint;
     paint.setAntiAlias(true);
     U8CPU alpha = icon_animation_->GetCurrentValue() * 0xff;
@@ skipping 166 matching lines @@
   icon_animation_.reset(animation);
 }
 
 void Tab::StopRecordingAnimation() {
   if (!icon_animation_.get())
     return;
   icon_animation_->Stop();
   icon_animation_.reset();
 }
 
-void Tab::StartAudioPlayingAnimation() {
-  ui::ThrobAnimation* animation = new ui::ThrobAnimation(this);
-  animation->SetTweenType(ui::Tween::LINEAR);
-  animation->SetThrobDuration(2000);
-  animation->StartThrobbing(-1);
-  icon_animation_.reset(animation);
-}
-
-void Tab::StopAudioPlayingAnimation() {
-  if (!icon_animation_.get())
-    return;
-  icon_animation_->Stop();
-  icon_animation_.reset();
-}
-
 bool Tab::IsPerformingCrashAnimation() const {
   return icon_animation_.get() && data_.IsCrashed();
 }
 
 void Tab::ScheduleIconPaint() {
   gfx::Rect bounds = GetIconBounds();
   if (bounds.IsEmpty())
     return;
 
   // Extends the area to the bottom when sad_favicon is
@@ skipping 66 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();
 }