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

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

Issue 975943003: Revert of Revert of Propagate audible state from player to the containing tab" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 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 MediaPlayersObserver;
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);
(...skipping 13 matching lines...) Expand all
38 bool OnMediaPlayerSetCdmMessageReceived(const IPC::Message& message, 43 bool OnMediaPlayerSetCdmMessageReceived(const IPC::Message& message,
39 RenderFrameHost* render_frame_host); 44 RenderFrameHost* render_frame_host);
40 45
41 // Gets the media player manager associated with |render_frame_host|. Creates 46 // 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. 47 // a new one if it doesn't exist. The caller doesn't own the returned pointer.
43 BrowserMediaPlayerManager* GetMediaPlayerManager( 48 BrowserMediaPlayerManager* GetMediaPlayerManager(
44 RenderFrameHost* render_frame_host); 49 RenderFrameHost* render_frame_host);
45 50
46 void OnSetCdm(RenderFrameHost* render_frame_host, int player_id, int cdm_id); 51 void OnSetCdm(RenderFrameHost* render_frame_host, int player_id, int cdm_id);
47 52
53 MediaPlayersObserver* GetMediaPlayersObserver() const;
54
48 #if defined(VIDEO_HOLE) 55 #if defined(VIDEO_HOLE)
49 void OnFrameInfoUpdated(); 56 void OnFrameInfoUpdated();
50 #endif // defined(VIDEO_HOLE) 57 #endif // defined(VIDEO_HOLE)
51 58
52 private: 59 private:
53 // Map from RenderFrameHost* to BrowserMediaPlayerManager. 60 // Map from RenderFrameHost* to BrowserMediaPlayerManager.
54 typedef base::ScopedPtrHashMap<uintptr_t, BrowserMediaPlayerManager> 61 typedef base::ScopedPtrHashMap<uintptr_t, BrowserMediaPlayerManager>
55 MediaPlayerManagerMap; 62 MediaPlayerManagerMap;
56 MediaPlayerManagerMap media_player_managers_; 63 MediaPlayerManagerMap media_player_managers_;
57 #endif // defined(OS_ANDROID) 64 #endif // defined(OS_ANDROID)
58 65
59 private: 66 private:
60 DISALLOW_COPY_AND_ASSIGN(MediaWebContentsObserver); 67 DISALLOW_COPY_AND_ASSIGN(MediaWebContentsObserver);
61 }; 68 };
62 69
63 } // namespace content 70 } // namespace content
64 71
65 #endif // CONTENT_BROWSER_MEDIA_MEDIA_WEB_CONTENTS_OBSERVER_H_ 72 #endif // CONTENT_BROWSER_MEDIA_MEDIA_WEB_CONTENTS_OBSERVER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698