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

Unified Diff: chrome/browser/ui/cocoa/tabs/throbbing_image_view.mm

Issue 13867007: Tab audio indicator: Use animation container on Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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
Index: chrome/browser/ui/cocoa/tabs/throbbing_image_view.mm
diff --git a/chrome/browser/ui/cocoa/tabs/throbbing_image_view.mm b/chrome/browser/ui/cocoa/tabs/throbbing_image_view.mm
index c3df7a889e0de13106351251506d87509a46164c..6afad1088b3b4dc94e2f35c7bb8f5d1bea9f8660 100644
--- a/chrome/browser/ui/cocoa/tabs/throbbing_image_view.mm
+++ b/chrome/browser/ui/cocoa/tabs/throbbing_image_view.mm
@@ -19,16 +19,18 @@ class ThrobbingImageViewAnimationDelegate : public ui::AnimationDelegate {
@implementation ThrobbingImageView
- (id)initWithFrame:(NSRect)rect
- backgroundImage:(NSImage*)backgroundImage
- throbImage:(NSImage*)throbImage
- durationMS:(int)durationMS
- throbPosition:(ThrobPosition)throbPosition {
+ backgroundImage:(NSImage*)backgroundImage
+ throbImage:(NSImage*)throbImage
+ durationMS:(int)durationMS
+ throbPosition:(ThrobPosition)throbPosition
+ animationContainer:(ui::AnimationContainer*)animationContainer {
if ((self = [super initWithFrame:rect])) {
backgroundImage_.reset([backgroundImage retain]);
throbImage_.reset([throbImage retain]);
delegate_.reset(new ThrobbingImageViewAnimationDelegate(self));
throbAnimation_.reset(new ui::ThrobAnimation(delegate_.get()));
+ throbAnimation_->SetContainer(animationContainer);
throbAnimation_->SetThrobDuration(durationMS);
throbAnimation_->StartThrobbing(-1);
« no previous file with comments | « chrome/browser/ui/cocoa/tabs/throbbing_image_view.h ('k') | chrome/browser/ui/cocoa/tabs/throbbing_image_view_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698