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

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

Issue 12701004: Revert 185715 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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/cocoa/tabs/throbbing_image_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
===================================================================
--- chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm (revision 187214)
+++ chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm (working copy)
@@ -111,9 +111,6 @@
// Throbbing duration on webrtc "this web page is watching you" favicon overlay.
const int kRecordingDurationMs = 1000;
-// Throbbing duration on audio playing animation.
-const int kAudioPlayingDurationMs = 2000;
-
// Helper class for doing NSAnimationContext calls that takes a bool to disable
// all the work. Useful for code that wants to conditionally animate.
class ScopedNSAnimationContextGroup {
@@ -1608,21 +1605,6 @@
throbPosition:kThrobPositionBottomRight] autorelease];
iconView = recordingView;
- } else if (theme && chrome::IsPlayingAudio(contents)) {
- NSImage* audioImage =
- theme->GetNSImageNamed(IDR_AUDIO_ANIMATION, true);
- NSRect frame =
- NSMakeRect(0, 0, kIconWidthAndHeight, kIconWidthAndHeight);
- ThrobbingImageView* equalizerFaviconView =
- [[[ThrobbingImageView alloc]
- initWithFrame:frame
- backgroundImage:[imageView image]
- throbImage:audioImage
- durationMS:kAudioPlayingDurationMs
- throbPosition:kThrobPositionOverlay] autorelease];
- [equalizerFaviconView setTweenType:ui::Tween::LINEAR];
-
- iconView = equalizerFaviconView;
} else {
iconView = imageView;
}
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/tabs/throbbing_image_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698