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

Side by Side Diff: content/browser/media/media_web_contents_observer.h

Issue 896673003: Propagate audible state from player to the containing tab (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed Ted's comments and compiled IsAudible() only under OS_ANDROID Created 5 years, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_BROWSER_MEDIA_MEDIA_WEB_CONTENTS_OBSERVER_H_ 5 #ifndef CONTENT_BROWSER_MEDIA_MEDIA_WEB_CONTENTS_OBSERVER_H_
6 #define CONTENT_BROWSER_MEDIA_MEDIA_WEB_CONTENTS_OBSERVER_H_ 6 #define CONTENT_BROWSER_MEDIA_MEDIA_WEB_CONTENTS_OBSERVER_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/containers/scoped_ptr_hash_map.h" 9 #include "base/containers/scoped_ptr_hash_map.h"
10 #include "base/memory/scoped_ptr.h"
10 #include "content/common/content_export.h" 11 #include "content/common/content_export.h"
11 #include "content/public/browser/web_contents_observer.h" 12 #include "content/public/browser/web_contents_observer.h"
12 13
13 namespace content { 14 namespace content {
14 15
16 #if defined(OS_ANDROID)
17 class AudioMonitorAndroid;
18 #endif // defined(OS_ANDROID)
19
15 class BrowserCdmManager; 20 class BrowserCdmManager;
16 class BrowserMediaPlayerManager; 21 class BrowserMediaPlayerManager;
17 22
18 // This class manages all RenderFrame based media related managers at the 23 // This class manages all RenderFrame based media related managers at the
19 // browser side. It receives IPC messages from media RenderFrameObservers and 24 // browser side. It receives IPC messages from media RenderFrameObservers and
20 // forwards them to the corresponding managers. The managers are responsible 25 // forwards them to the corresponding managers. The managers are responsible
21 // for sending IPCs back to the RenderFrameObservers at the render side. 26 // for sending IPCs back to the RenderFrameObservers at the render side.
22 class CONTENT_EXPORT MediaWebContentsObserver : public WebContentsObserver { 27 class CONTENT_EXPORT MediaWebContentsObserver : public WebContentsObserver {
23 public: 28 public:
24 explicit MediaWebContentsObserver(WebContents* web_contents); 29 explicit MediaWebContentsObserver(WebContents* web_contents);
25 ~MediaWebContentsObserver() override; 30 ~MediaWebContentsObserver() override;
26 31
27 // WebContentsObserver implementations. 32 // WebContentsObserver implementations.
28 void RenderFrameDeleted(RenderFrameHost* render_frame_host) override; 33 void RenderFrameDeleted(RenderFrameHost* render_frame_host) override;
29 34
30 #if defined(OS_ANDROID) 35 #if defined(OS_ANDROID)
36 // Returns true if at least one player is playing sound and false if
37 // they are all silent.
38 bool IsAudible() const;
39
31 bool OnMessageReceived(const IPC::Message& message, 40 bool OnMessageReceived(const IPC::Message& message,
32 RenderFrameHost* render_frame_host) override; 41 RenderFrameHost* render_frame_host) override;
33 42
34 // Helper functions to handle media player IPC messages. Returns whether the 43 // Helper functions to handle media player IPC messages. Returns whether the
35 // |message| is handled in the function. 44 // |message| is handled in the function.
36 bool OnMediaPlayerMessageReceived(const IPC::Message& message, 45 bool OnMediaPlayerMessageReceived(const IPC::Message& message,
37 RenderFrameHost* render_frame_host); 46 RenderFrameHost* render_frame_host);
38 bool OnMediaPlayerSetCdmMessageReceived(const IPC::Message& message, 47 bool OnMediaPlayerSetCdmMessageReceived(const IPC::Message& message,
39 RenderFrameHost* render_frame_host); 48 RenderFrameHost* render_frame_host);
40 49
41 // Gets the media player manager associated with |render_frame_host|. Creates 50 // Gets the media player manager associated with |render_frame_host|. Creates
42 // a new one if it doesn't exist. The caller doesn't own the returned pointer. 51 // a new one if it doesn't exist. The caller doesn't own the returned pointer.
43 BrowserMediaPlayerManager* GetMediaPlayerManager( 52 BrowserMediaPlayerManager* GetMediaPlayerManager(
44 RenderFrameHost* render_frame_host); 53 RenderFrameHost* render_frame_host);
45 54
46 void OnSetCdm(RenderFrameHost* render_frame_host, int player_id, int cdm_id); 55 void OnSetCdm(RenderFrameHost* render_frame_host, int player_id, int cdm_id);
47 56
48 #if defined(VIDEO_HOLE) 57 #if defined(VIDEO_HOLE)
49 void OnFrameInfoUpdated(); 58 void OnFrameInfoUpdated();
50 #endif // defined(VIDEO_HOLE) 59 #endif // defined(VIDEO_HOLE)
51 60
52 private: 61 private:
53 // Map from RenderFrameHost* to BrowserMediaPlayerManager. 62 // Map from RenderFrameHost* to BrowserMediaPlayerManager.
54 typedef base::ScopedPtrHashMap<uintptr_t, BrowserMediaPlayerManager> 63 typedef base::ScopedPtrHashMap<uintptr_t, BrowserMediaPlayerManager>
55 MediaPlayerManagerMap; 64 MediaPlayerManagerMap;
56 MediaPlayerManagerMap media_player_managers_; 65 MediaPlayerManagerMap media_player_managers_;
66
67 scoped_ptr<AudioMonitorAndroid> audio_monitor_;
no sievers 2015/02/10 01:33:03 Can you put this before |media_player_managers_|,
Tima Vaisburd 2015/02/11 03:34:05 Done.
57 #endif // defined(OS_ANDROID) 68 #endif // defined(OS_ANDROID)
58 69
59 private: 70 private:
60 DISALLOW_COPY_AND_ASSIGN(MediaWebContentsObserver); 71 DISALLOW_COPY_AND_ASSIGN(MediaWebContentsObserver);
61 }; 72 };
62 73
63 } // namespace content 74 } // namespace content
64 75
65 #endif // CONTENT_BROWSER_MEDIA_MEDIA_WEB_CONTENTS_OBSERVER_H_ 76 #endif // CONTENT_BROWSER_MEDIA_MEDIA_WEB_CONTENTS_OBSERVER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698