Audio indicator: Views UI

Audio indicator: Views UI

This CL hooks up the new TabAudioIndicator class to the Views UI.

Test build: https://docs.google.com/file/d/0B0Odde3V7EhWQklseGhYcmZ5R3M/edit?usp=sharing

BUG=3541
TEST=Played audio and verified that an audio indicator was displayed
in the tab.

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=188191

[cpu_(ooo_6.6-7.5), 2013-03-11 21:33:36]

lgtm

https://codereview.chromium.org/12757002/diff/2001/chrome/browser/ui/views/ta...
File chrome/browser/ui/views/tabs/tab.cc (right):

https://codereview.chromium.org/12757002/diff/2001/chrome/browser/ui/views/ta...
chrome/browser/ui/views/tabs/tab.cc:679: if (!icon_animation_)
some comment here would be nice.

[sail, 2013-03-11 23:48:12]

https://codereview.chromium.org/12757002/diff/2001/chrome/browser/ui/views/ta...
File chrome/browser/ui/views/tabs/tab.cc (right):

https://codereview.chromium.org/12757002/diff/2001/chrome/browser/ui/views/ta...
chrome/browser/ui/views/tabs/tab.cc:679: if (!icon_animation_)
On 2013/03/11 21:33:36, cpu wrote:
> some comment here would be nice.

Done.

[commit-bot: I haz the power, 2013-03-13 01:24:03]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/sail@chromium.org/12757002/16001

[commit-bot: I haz the power, 2013-03-13 01:24:07]

Presubmit check for 12757002-16001 failed and returned exit status 1.

INFO:root:Found 3 file(s).

Running presubmit commit checks ...
Running /b/commit-queue/workdir/chromium/PRESUBMIT.py
Running /b/commit-queue/workdir/chromium/chrome/PRESUBMIT.py
Running /b/commit-queue/workdir/chromium/chrome/browser/ui/views/PRESUBMIT.py

** Presubmit ERRORS **
Missing LGTM from an OWNER for these files:
    chrome/browser/ui/views/tabs/tab_unittest.cc
    chrome/browser/ui/views/tabs/tab.cc
    chrome/browser/ui/views/tabs/tab.h

Presubmit checks took 1.2s to calculate.

[sail, 2013-03-13 01:34:06]

+sky for chrome/browser/ui/views OWNERS review

[sky, 2013-03-14 00:29:35]

LGTM

[commit-bot: I haz the power, 2013-03-14 00:32:41]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/sail@chromium.org/12757002/16001

[commit-bot: I haz the power, 2013-03-14 04:29:32]

Retried try job too often on win_x64_rel for step(s) compile
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_x64_re...

[commit-bot: I haz the power, 2013-03-14 05:21:59]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/sail@chromium.org/12757002/16001

[commit-bot: I haz the power, 2013-03-14 05:22:00]

Failed to apply patch for chrome/browser/ui/views/tabs/tab.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/ui/views/tabs/tab.cc
  Hunk #1 succeeded at 474 (offset -1 lines).
  Hunk #2 succeeded at 484 (offset -1 lines).
  Hunk #3 succeeded at 523 (offset -1 lines).
  Hunk #4 FAILED at 539.
  Hunk #5 succeeded at 659 (offset -13 lines).
  Hunk #6 succeeded at 1430 (offset -26 lines).
  Hunk #7 succeeded at 1689 (offset 37 lines).
  1 out of 7 hunks FAILED -- saving rejects to file
chrome/browser/ui/views/tabs/tab.cc.rej

Patch:       chrome/browser/ui/views/tabs/tab.cc
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
ded96be938a38f7ea63894ac568aaff3ac1c1f96..078fb12fa09fe2e7e74a61495f6cb80527613fdc
100644
--- a/chrome/browser/ui/views/tabs/tab.cc
+++ b/chrome/browser/ui/views/tabs/tab.cc
@@ -475,6 +475,8 @@ Tab::Tab(TabController* controller)
   AddChildView(close_button_);
 
   set_context_menu_controller(this);
+
+  tab_audio_indicator_.reset(new TabAudioIndicator(this));
 }
 
 Tab::~Tab() {
@@ -483,6 +485,7 @@ 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 {
@@ -521,20 +524,8 @@ void Tab::SetData(const TabRendererData& data) {
     }
   } 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();
@@ -548,6 +539,8 @@ void Tab::SetData(const TabRendererData& data) {
     }
   }
 
+  tab_audio_indicator_->SetIsPlayingAudio(data_.AudioActive());
+
   // If the favicon changed, re-compute its dominant color.
   if (controller() &&
       controller()->IsImmersiveStyle() &&
@@ -681,6 +674,16 @@ int Tab::GetImmersiveHeight() {
 }
 

////////////////////////////////////////////////////////////////////////////////
+// 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) {
@@ -1455,21 +1458,10 @@ void Tab::PaintIcon(gfx::Canvas* canvas) {
                        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);
       }
     }
   }
@@ -1662,14 +1654,6 @@ void Tab::StartRecordingAnimation() {
   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();
 }

[commit-bot: I haz the power, 2013-03-14 17:11:22]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/sail@chromium.org/12757002/41001

[sail, 2013-03-14 21:01:19]

Committed patchset #7 manually as r188191 (presubmit successful).