Audio indicator: Views UI

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 456 matching lines @@
   close_button_->SetImage(views::CustomButton::STATE_PRESSED,
                           rb.GetImageSkiaNamed(IDR_TAB_CLOSE_P));
   close_button_->SetAccessibleName(
       l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE));
   // Disable animation so that the red danger sign shows up immediately
   // to help avoid mis-clicks.
   close_button_->SetAnimationDuration(0);
   AddChildView(close_button_);
 
   set_context_menu_controller(this);
+
+  tab_audio_indicator_.reset(new TabAudioIndicator(this));
 }
 
 Tab::~Tab() {
 }
 
 void Tab::set_animation_container(ui::AnimationContainer* container) {
   animation_container_ = container;
   hover_controller_.SetAnimationContainer(container);
+  tab_audio_indicator_->SetAnimationContainer(container);
 }
 
 bool Tab::IsActive() const {
   return controller() ? controller()->IsActiveTab(this) : true;
 }
 
 bool Tab::IsSelected() const {
   return controller() ? controller()->IsTabSelected(this) : true;
 }
 
@@ skipping 18 matching lines @@
       // 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_.CaptureActive() && old.CaptureActive()) {
     StopIconAnimation();
-    if (data_.AudioActive())
-      StartAudioPlayingAnimation();
   } else if (data_.CaptureActive() && !old.CaptureActive()) {
-    // Capture indicator overrides the audio indicator if presently shown.
-    old.audio_state = TabRendererData::AUDIO_STATE_NONE;
-    data_.audio_state = TabRendererData::AUDIO_STATE_NONE;
     StartRecordingAnimation();
-  } else if (!data_.CaptureActive()) {
-    // Start or stop the audio indicator only if not capturing.
-    if (!data_.AudioActive() && old.AudioActive()) {
-      StopIconAnimation();
-    } else if (data_.AudioActive() && !old.AudioActive()) {
-      StartAudioPlayingAnimation();
-    }
   } else {
     if (IsPerformingCrashAnimation())
       StopIconAnimation();
     ResetCrashedFavicon();
   }
 
   if (old.mini != data_.mini) {
     if (tab_animation_.get() && tab_animation_->is_animating()) {
       tab_animation_->Stop();
       tab_animation_.reset(NULL);
     }
   }
 
+  tab_audio_indicator_->SetIsPlayingAudio(data_.AudioActive());
+
   DataChanged(old);
 
   Layout();
   SchedulePaint();
 }
 
 void Tab::UpdateLoadingAnimation(TabRendererData::NetworkState state) {
   if (state == data_.network_state &&
       state == TabRendererData::NETWORK_STATE_NONE) {
     // If the network state is none and hasn't changed, do nothing. Otherwise we
@@ skipping 101 matching lines @@
 int Tab::GetMiniWidth() {
   return browser_defaults::kMiniTabWidth;
 }
 
 // static
 int Tab::GetImmersiveHeight() {
   return kImmersiveTabHeight;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// Tab, TabAudioIndicator::Delegate overrides:
+
+void Tab::ScheduleAudioIndicatorPaint() {
+  // No need to schedule a paint if another animation is active. The other
+  // animation will do its own scheduling.
+  if (!icon_animation_)
+    ScheduleIconPaint();
+}
+
+////////////////////////////////////////////////////////////////////////////////
 // Tab, AnimationDelegate overrides:
 
 void Tab::AnimationProgressed(const ui::Animation* animation) {
   // Ignore if the pulse animation is being performed on active tab because
   // it repaints the same image. See |Tab::PaintTabBackground()|.
   if (animation == tab_animation_.get() && IsActive())
     return;
   SchedulePaint();
 }
 
@@ skipping 741 matching lines @@
         DrawIconCenter(canvas, projection_screen, 0,
                        data().favicon.width(),
                        data().favicon.height(),
                        bounds, true, SkPaint());
       } else {
         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());
-        }
+        // 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 235 matching lines @@
 }
 
 void Tab::StartRecordingAnimation() {
   ui::ThrobAnimation* animation = new ui::ThrobAnimation(this);
   animation->SetTweenType(ui::Tween::EASE_IN_OUT);
   animation->SetThrobDuration(kRecordingDurationMs);
   animation->StartThrobbing(-1);
   icon_animation_.reset(animation);
 }
 
-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);
-}
-
 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 97 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();
 }