chrome/browser/ui/cocoa/tabs/media_indicator_view.mm - Issue 688523002: [Cocoa] Tab audio mute control, behind a switch (off by default).

Side by Side Diff: chrome/browser/ui/cocoa/tabs/media_indicator_view.mm

Issue 688523002: [Cocoa] Tab audio mute control, behind a switch (off by default). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Prevent TabStripController from unconditionally causing creation of MediaIndicatorButton. Created 6 years, 1 month 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 unified diff | Download patch

« chrome/browser/ui/cocoa/tabs/media_indicator_button.mm ('K') | « chrome/browser/ui/cocoa/tabs/media_indicator_view.h ('k') | chrome/browser/ui/cocoa/tabs/media_indicator_view_unittest.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
	(Empty)
1 // Copyright 2013 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.

4

5 #import "chrome/browser/ui/cocoa/tabs/media_indicator_view.h"

6

7 #include "ui/gfx/animation/animation.h"

8 #include "ui/gfx/animation/animation_delegate.h"

9 #include "ui/gfx/image/image.h"

10

11 class MediaIndicatorViewAnimationDelegate : public gfx::AnimationDelegate {

12 public:

13 MediaIndicatorViewAnimationDelegate(NSView* view,

14 TabMediaState* mediaState,

15 TabMediaState* animatingMediaState)

16 : view_(view), mediaState_(mediaState),

17 animatingMediaState_(animatingMediaState),

18 doneCallbackObject_(nil), doneCallbackSelector_(nil) {}

19 ~MediaIndicatorViewAnimationDelegate() override {}

20

21 void SetAnimationDoneCallback(id anObject, SEL selector) {

22 doneCallbackObject_ = anObject;

23 doneCallbackSelector_ = selector;

24 }

25

26 void AnimationEnded(const gfx::Animation* animation) override {

27 animatingMediaState_ = mediaState_;

28 [view_ setNeedsDisplay:YES];

29 [doneCallbackObject_ performSelector:doneCallbackSelector_];

30 }

31 void AnimationProgressed(const gfx::Animation* animation) override {

32 [view_ setNeedsDisplay:YES];

33 }

34 void AnimationCanceled(const gfx::Animation* animation) override {

35 AnimationEnded(animation);

36 }

37

38 private:

39 NSView* const view_;

40 TabMediaState* const mediaState_;

41 TabMediaState* const animatingMediaState_;

42

43 id doneCallbackObject_;

44 SEL doneCallbackSelector_;

45 };

46

47 @implementation MediaIndicatorView

48

49 @synthesize mediaState = mediaState_;

50 @synthesize animatingMediaState = animatingMediaState_;

51

52 - (id)init {

53 if ((self = [super initWithFrame:NSZeroRect])) {

54 mediaState_ = animatingMediaState_ = TAB_MEDIA_STATE_NONE;

55 delegate_.reset(new MediaIndicatorViewAnimationDelegate(

56 self, &mediaState_, &animatingMediaState_));

57 }

58 return self;

59 }

60

61 - (void)updateIndicator:(TabMediaState)mediaState {

62 if (mediaState == mediaState_)

63 return;

64

65 mediaState_ = mediaState;

66 animation_.reset();

67

68 // Prepare this view if the new TabMediaState is an active one.

69 if (mediaState_ != TAB_MEDIA_STATE_NONE) {

70 animatingMediaState_ = mediaState_;

71 NSImage* const image =

72 chrome::GetTabMediaIndicatorImage(mediaState_).ToNSImage();

73 NSRect frame = [self frame];

74 frame.size = [image size];

75 [self setFrame:frame];

76 [self setImage:image];

77 }

78

79 // If the animation delegate is missing, that means animations were disabled

80 // for testing; so, go directly to animating completion state.

81 if (!delegate_) {

82 animatingMediaState_ = mediaState_;

83 return;

84 }

85

86 animation_ = chrome::CreateTabMediaIndicatorFadeAnimation(mediaState_);

87 animation_->set_delegate(delegate_.get());

88 animation_->Start();

89 }

90

91 - (void)setAnimationDoneCallbackObject:(id)anObject withSelector:(SEL)selector {

92 if (delegate_)

93 delegate_->SetAnimationDoneCallback(anObject, selector);

94 }

95

96 - (void)drawRect:(NSRect)rect {

97 if (!animation_)

98 return;

99

100 double opaqueness = animation_->GetCurrentValue();

101 if (mediaState_ == TAB_MEDIA_STATE_NONE)

102 opaqueness = 1.0 - opaqueness; // Fading out, not in.

103

104 [[self image] drawInRect:[self bounds]

105 fromRect:NSZeroRect

106 operation:NSCompositeSourceOver

107 fraction:opaqueness];

108 }

109

110 - (void)disableAnimations {

111 delegate_.reset();

112 }

113

114 @end

OLD	NEW