Replace animated tab audio indicator with static tab audio indicator.

chrome/browser/ui/views/tabs/tab.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_TABS_TAB_H_
 #define CHROME_BROWSER_UI_VIEWS_TABS_TAB_H_
 
 #include <list>
 #include <string>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/ui/tabs/tab_audio_indicator.h"
 #include "chrome/browser/ui/views/tabs/tab_renderer_data.h"
 #include "ui/base/layout.h"
 #include "ui/gfx/animation/animation_delegate.h"
 #include "ui/gfx/point.h"
 #include "ui/views/context_menu_controller.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/glow_hover_controller.h"
 #include "ui/views/view.h"
 
 class TabController;
 
 namespace gfx {
 class Animation;
 class AnimationContainer;
 class Font;
 class LinearAnimation;
 class MultiAnimation;
 }
 namespace views {
 class ImageButton;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 //
 //  A View that renders a Tab, either in a TabStrip or in a DraggedTabView.
 //
 ///////////////////////////////////////////////////////////////////////////////
-class Tab : public TabAudioIndicator::Delegate,
-            public gfx::AnimationDelegate,
+class Tab : public gfx::AnimationDelegate,
             public views::ButtonListener,
             public views::ContextMenuController,
             public views::View {
  public:
   // The menu button's class name.
   static const char kViewClassName[];
 
   explicit Tab(TabController* controller);
   virtual ~Tab();
 
@@ skipping 93 matching lines @@
 
     // Scale factor we're drawing it.
     ui::ScaleFactor scale_factor;
 
     // The image.
     gfx::ImageSkia image;
   };
 
   typedef std::list<ImageCacheEntry> ImageCache;
 
-  // Overridden from TabAudioIndicator::Delegate:
-  virtual void ScheduleAudioIndicatorPaint() OVERRIDE;
-
   // Overridden from gfx::AnimationDelegate:
   virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
   virtual void AnimationCanceled(const gfx::Animation* animation) OVERRIDE;
   virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE;
 
   // Overridden from views::ButtonListener:
   virtual void ButtonPressed(views::Button* sender,
                              const ui::Event& event) OVERRIDE;
 
   // Overridden from views::ContextMenuController:
@@ skipping 22 matching lines @@
   virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE;
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
   // Overridden from ui::EventHandler:
   virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
 
   // Returns the bounds of the title and icon.
   const gfx::Rect& GetTitleBounds() const;
   const gfx::Rect& GetIconBounds() const;
 
+  // Invoked from Layout to adjust the position of the favicon or audio
+  // indicator for mini tabs.
+  void MaybeAdjustLeftForMiniTab(gfx::Rect* bounds) const;
+
   // Invoked from SetData after |data_| has been updated to the new data.
   void DataChanged(const TabRendererData& old);
 
   // Paint with the normal tab style.
   void PaintTab(gfx::Canvas* canvas);
 
   // Paint with the "immersive mode" light-bar style.
   void PaintImmersiveTab(gfx::Canvas* canvas);
 
   // Paint various portions of the Tab
   void PaintTabBackground(gfx::Canvas* canvas);
   void PaintInactiveTabBackgroundWithTitleChange(
       gfx::Canvas* canvas,
       gfx::MultiAnimation* animation);
   void PaintInactiveTabBackground(gfx::Canvas* canvas);
   void PaintInactiveTabBackgroundUsingResourceId(gfx::Canvas* canvas,
                                                  int tab_id);
   void PaintActiveTabBackground(gfx::Canvas* canvas);
 
-  // Paints the icon at the specified coordinates, mirrored for RTL if needed.
+  // Paints the icon, audio indicator icon, etc., mirrored for RTL if needed.
   void PaintIcon(gfx::Canvas* canvas);
   void PaintCaptureState(gfx::Canvas* canvas, gfx::Rect bounds);
+  void PaintAudioIndicator(gfx::Canvas* canvas);
   void PaintTitle(gfx::Canvas* canvas, SkColor title_color);
 
   // Invoked if data_.network_state changes, or the network_state is not none.
   void AdvanceLoadingAnimation(TabRendererData::NetworkState old_state,
                                TabRendererData::NetworkState state);
 
   // Returns the number of favicon-size elements that can fit in the tab's
   // current size.
   int IconCapacity() const;
 
   // Returns whether the Tab should display a favicon.
   bool ShouldShowIcon() const;
 
+  // Returns whether the Tab should display the audio indicator.
+  bool ShouldShowAudioIndicator() const;
+
   // Returns whether the Tab should display a close button.
   bool ShouldShowCloseBox() const;
 
   // Gets the throb value for the tab. When a tab is not selected the
   // active background is drawn at |GetThrobValue()|%. This is used for hover,
   // mini tab title change and pulsing.
   double GetThrobValue();
 
   // Set the temporary offset for the favicon. This is used during the crash
   // animation.
@@ skipping 68 matching lines @@
 
   // The tab and the icon can both be animating. The tab 'throbs' by changing
   // color. The icon can have one of several of animations like crashing,
   // recording, projecting, etc. Note that the icon animation related to network
   // state does not have an animation associated with it.
   scoped_ptr<gfx::Animation> tab_animation_;
   scoped_ptr<gfx::LinearAnimation> icon_animation_;
 
   scoped_refptr<gfx::AnimationContainer> animation_container_;
 
-  scoped_ptr<TabAudioIndicator> tab_audio_indicator_;
-
   views::ImageButton* close_button_;
 
   ui::ThemeProvider* theme_provider_;
 
   bool tab_activated_with_last_gesture_begin_;
 
   views::GlowHoverController hover_controller_;
 
   // The bounds of various sections of the display.
   gfx::Rect favicon_bounds_;
   gfx::Rect title_bounds_;
+  gfx::Rect audio_indicator_bounds_;
 
   // The offset used to paint the inactive background image.
   gfx::Point background_offset_;
 
   struct TabImage {
     gfx::ImageSkia* image_l;
     gfx::ImageSkia* image_c;
     gfx::ImageSkia* image_r;
     int l_width;
     int r_width;
   };
   static TabImage tab_active_;
   static TabImage tab_inactive_;
   static TabImage tab_alpha_;
 
   // Whether we're showing the icon. It is cached so that we can detect when it
   // changes and layout appropriately.
   bool showing_icon_;
 
+  // Whether we're showing the audio indicator. It is cached so that we can
+  // detect when it changes and layout appropriately.
+  bool showing_audio_indicator_;
+
   // Whether we are showing the close button. It is cached so that we can
   // detect when it changes and layout appropriately.
   bool showing_close_button_;
 
   // The current color of the close button.
   SkColor close_button_color_;
 
   static gfx::Font* font_;
   static int font_height_;
 
   // As the majority of the tabs are inactive, and painting tabs is slowish,
   // we cache a handful of the inactive tab backgrounds here.
   static ImageCache* image_cache_;
 
   DISALLOW_COPY_AND_ASSIGN(Tab);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_TABS_TAB_H_