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

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

Issue 1515623002: Media Session: passing metadata from renderer/ to browser/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@media_session_ipc
Patch Set: semicolon Created 4 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 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 "base/containers/scoped_ptr_hash_map.h" 10 #include "base/containers/scoped_ptr_hash_map.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 49
50 private: 50 private:
51 // Helper functions to handle media player IPC messages. Returns whether the 51 // Helper functions to handle media player IPC messages. Returns whether the
52 // |message| is handled in the function. 52 // |message| is handled in the function.
53 bool OnMediaPlayerMessageReceived(const IPC::Message& message, 53 bool OnMediaPlayerMessageReceived(const IPC::Message& message,
54 RenderFrameHost* render_frame_host); 54 RenderFrameHost* render_frame_host);
55 55
56 bool OnMediaPlayerSetCdmMessageReceived(const IPC::Message& message, 56 bool OnMediaPlayerSetCdmMessageReceived(const IPC::Message& message,
57 RenderFrameHost* render_frame_host); 57 RenderFrameHost* render_frame_host);
58 58
59 bool OnMediaSessionMessageReceived(const IPC::Message& message,
60 RenderFrameHost* render_frame_host);
61
59 void OnSetCdm(RenderFrameHost* render_frame_host, int player_id, int cdm_id); 62 void OnSetCdm(RenderFrameHost* render_frame_host, int player_id, int cdm_id);
60 63
61 // Map from RenderFrameHost* to BrowserMediaPlayerManager. 64 // Map from RenderFrameHost* to BrowserMediaPlayerManager.
62 using MediaPlayerManagerMap = 65 using MediaPlayerManagerMap =
63 base::ScopedPtrHashMap<RenderFrameHost*, 66 base::ScopedPtrHashMap<RenderFrameHost*,
64 scoped_ptr<BrowserMediaPlayerManager>>; 67 scoped_ptr<BrowserMediaPlayerManager>>;
65 MediaPlayerManagerMap media_player_managers_; 68 MediaPlayerManagerMap media_player_managers_;
66 69
67 // Map from RenderFrameHost* to BrowserMediaSessionManager. 70 // Map from RenderFrameHost* to BrowserMediaSessionManager.
68 using MediaSessionManagerMap = 71 using MediaSessionManagerMap =
69 base::ScopedPtrHashMap<RenderFrameHost*, 72 base::ScopedPtrHashMap<RenderFrameHost*,
70 scoped_ptr<BrowserMediaSessionManager>>; 73 scoped_ptr<BrowserMediaSessionManager>>;
71 MediaSessionManagerMap media_session_managers_; 74 MediaSessionManagerMap media_session_managers_;
72 75
73 DISALLOW_COPY_AND_ASSIGN(MediaWebContentsObserverAndroid); 76 DISALLOW_COPY_AND_ASSIGN(MediaWebContentsObserverAndroid);
74 }; 77 };
75 78
76 } // namespace content 79 } // namespace content
77 80
78 #endif // CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_WEB_CONTENTS_OBSERVER_ANDROID_H_ 81 #endif // CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_WEB_CONTENTS_OBSERVER_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698