Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(45)

Unified Diff: chrome/browser/ui/views/tabs/tab.h

Issue 12757002: Audio indicator: Views UI (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/views/tabs/tab.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/tabs/tab.h
diff --git a/chrome/browser/ui/views/tabs/tab.h b/chrome/browser/ui/views/tabs/tab.h
index 502f60f122fe9d0175dd5194eb023c59cfa73c4f..02bf8eb7b429878a62a2bc5b488fc069aea1f53b 100644
--- a/chrome/browser/ui/views/tabs/tab.h
+++ b/chrome/browser/ui/views/tabs/tab.h
@@ -10,6 +10,7 @@
#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/animation/animation_delegate.h"
#include "ui/base/layout.h"
@@ -39,7 +40,8 @@ class ImageButton;
// A View that renders a Tab, either in a TabStrip or in a DraggedTabView.
//
///////////////////////////////////////////////////////////////////////////////
-class Tab : public ui::AnimationDelegate,
+class Tab : public TabAudioIndicator::Delegate,
+ public ui::AnimationDelegate,
public views::ButtonListener,
public views::ContextMenuController,
public views::View {
@@ -144,6 +146,9 @@ class Tab : public ui::AnimationDelegate,
typedef std::list<ImageCacheEntry> ImageCache;
+ // Overridden from TabAudioIndicator::Delegate:
+ virtual void ScheduleAudioIndicatorPaint() OVERRIDE;
+
// Overridden from ui::AnimationDelegate:
virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
virtual void AnimationCanceled(const ui::Animation* animation) OVERRIDE;
@@ -237,7 +242,6 @@ class Tab : public ui::AnimationDelegate,
void StopIconAnimation();
void StartCrashAnimation();
void StartRecordingAnimation();
- void StartAudioPlayingAnimation();
// Returns true if the crash animation is currently running.
bool IsPerformingCrashAnimation() const;
@@ -308,6 +312,8 @@ class Tab : public ui::AnimationDelegate,
scoped_refptr<ui::AnimationContainer> animation_container_;
+ scoped_ptr<TabAudioIndicator> tab_audio_indicator_;
+
views::ImageButton* close_button_;
ui::ThemeProvider* theme_provider_;
« no previous file with comments | « no previous file | chrome/browser/ui/views/tabs/tab.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698