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

Side by Side Diff: content/browser/media/android/media_web_contents_observer_android.h

Issue 2399023002: Make MediaSession available on Desktop (Closed)
Patch Set: merge BrowserMediaSessionManager into MediaSessionServiceImpl, temporarily removing BrowserTests Created 4 years, 2 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_ANDROID_MEDIA_WEB_CONTENTS_OBSERVER_ANDROID_H_ 5 #ifndef CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_WEB_CONTENTS_OBSERVER_ANDROID_H_
6 #define CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_WEB_CONTENTS_OBSERVER_ANDROID_H_ 6 #define CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_WEB_CONTENTS_OBSERVER_ANDROID_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
11 11
12 #include "base/containers/scoped_ptr_hash_map.h"
13 #include "base/macros.h" 12 #include "base/macros.h"
14 #include "content/browser/media/media_web_contents_observer.h" 13 #include "content/browser/media/media_web_contents_observer.h"
15 #include "content/common/content_export.h" 14 #include "content/common/content_export.h"
16 15
17 namespace media { 16 namespace media {
18 enum class MediaContentType; 17 enum class MediaContentType;
19 } // namespace media 18 } // namespace media
20 19
21 namespace content { 20 namespace content {
22 21
23 class BrowserMediaPlayerManager; 22 class BrowserMediaPlayerManager;
24 class BrowserMediaSessionManager;
25 class BrowserSurfaceViewManager; 23 class BrowserSurfaceViewManager;
26 24
27 // This class adds Android specific extensions to the MediaWebContentsObserver. 25 // This class adds Android specific extensions to the MediaWebContentsObserver.
28 class CONTENT_EXPORT MediaWebContentsObserverAndroid 26 class CONTENT_EXPORT MediaWebContentsObserverAndroid
29 : public MediaWebContentsObserver { 27 : public MediaWebContentsObserver {
30 public: 28 public:
31 explicit MediaWebContentsObserverAndroid(WebContents* web_contents); 29 explicit MediaWebContentsObserverAndroid(WebContents* web_contents);
32 ~MediaWebContentsObserverAndroid() override; 30 ~MediaWebContentsObserverAndroid() override;
33 31
34 // Returns the android specific observer for a given web contents. 32 // Returns the android specific observer for a given web contents.
35 static MediaWebContentsObserverAndroid* FromWebContents( 33 static MediaWebContentsObserverAndroid* FromWebContents(
36 WebContents* web_contents); 34 WebContents* web_contents);
37 35
38 // Gets one of the managers associated with the given |render_frame_host|. 36 // Gets one of the managers associated with the given |render_frame_host|.
39 // Creates a new one if it doesn't exist. The caller doesn't own the 37 // Creates a new one if it doesn't exist. The caller doesn't own the
40 // returned pointer. 38 // returned pointer.
41 BrowserMediaPlayerManager* GetMediaPlayerManager( 39 BrowserMediaPlayerManager* GetMediaPlayerManager(
42 RenderFrameHost* render_frame_host); 40 RenderFrameHost* render_frame_host);
43 BrowserMediaSessionManager* GetMediaSessionManager(
44 RenderFrameHost* render_frame_host);
45 BrowserSurfaceViewManager* GetSurfaceViewManager( 41 BrowserSurfaceViewManager* GetSurfaceViewManager(
46 RenderFrameHost* render_frame_host); 42 RenderFrameHost* render_frame_host);
47 43
48 // Sets or overrides the BrowserMediaSessionManager for the given
49 // |render_frame_host|.
50 void SetMediaSessionManagerForTest(
51 RenderFrameHost* render_frame_host,
52 std::unique_ptr<BrowserMediaSessionManager> manager);
53
54 // Called by the WebContents when a tab has been closed but may still be 44 // Called by the WebContents when a tab has been closed but may still be
55 // available for "undo" -- indicates that all media players (even audio only 45 // available for "undo" -- indicates that all media players (even audio only
56 // players typically allowed background audio) bound to this WebContents must 46 // players typically allowed background audio) bound to this WebContents must
57 // be suspended. 47 // be suspended.
58 void SuspendAllMediaPlayers(); 48 void SuspendAllMediaPlayers();
59 49
60 // Initiates a synchronous MediaSession request for browser side players. 50 // Initiates a synchronous MediaSession request for browser side players.
61 // 51 //
62 // TODO(dalecurtis): Delete this method once we're no longer using WMPA and 52 // TODO(dalecurtis): Delete this method once we're no longer using WMPA and
63 // the BrowserMediaPlayerManagers. Tracked by http://crbug.com/580626 53 // the BrowserMediaPlayerManagers. Tracked by http://crbug.com/580626
(...skipping 19 matching lines...) Expand all
83 73
84 bool OnSurfaceViewManagerMessageReceived(const IPC::Message& message, 74 bool OnSurfaceViewManagerMessageReceived(const IPC::Message& message,
85 RenderFrameHost* render_frame_host); 75 RenderFrameHost* render_frame_host);
86 76
87 // Map from RenderFrameHost* to BrowserMediaPlayerManager. 77 // Map from RenderFrameHost* to BrowserMediaPlayerManager.
88 using MediaPlayerManagerMap = 78 using MediaPlayerManagerMap =
89 base::ScopedPtrHashMap<RenderFrameHost*, 79 base::ScopedPtrHashMap<RenderFrameHost*,
90 std::unique_ptr<BrowserMediaPlayerManager>>; 80 std::unique_ptr<BrowserMediaPlayerManager>>;
91 MediaPlayerManagerMap media_player_managers_; 81 MediaPlayerManagerMap media_player_managers_;
92 82
93 // Map from RenderFrameHost* to BrowserMediaSessionManager.
94 using MediaSessionManagerMap =
95 base::ScopedPtrHashMap<RenderFrameHost*,
96 std::unique_ptr<BrowserMediaSessionManager>>;
97 MediaSessionManagerMap media_session_managers_;
98
99 using SurfaceViewManagerMap = 83 using SurfaceViewManagerMap =
100 base::ScopedPtrHashMap<RenderFrameHost*, 84 base::ScopedPtrHashMap<RenderFrameHost*,
101 std::unique_ptr<BrowserSurfaceViewManager>>; 85 std::unique_ptr<BrowserSurfaceViewManager>>;
102 SurfaceViewManagerMap surface_view_managers_; 86 SurfaceViewManagerMap surface_view_managers_;
103 87
104 DISALLOW_COPY_AND_ASSIGN(MediaWebContentsObserverAndroid); 88 DISALLOW_COPY_AND_ASSIGN(MediaWebContentsObserverAndroid);
105 }; 89 };
106 90
107 } // namespace content 91 } // namespace content
108 92
109 #endif // CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_WEB_CONTENTS_OBSERVER_ANDROID_H_ 93 #endif // CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_WEB_CONTENTS_OBSERVER_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698