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

Side by Side Diff: content/renderer/media/android/renderer_media_session_manager.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: cleanup Created 5 years 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_RENDERER_MEDIA_ANDROID_RENDERER_MEDIA_SESSION_MANAGER_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_RENDERER_MEDIA_SESSION_MANAGER_H_
6 #define CONTENT_RENDERER_MEDIA_ANDROID_RENDERER_MEDIA_SESSION_MANAGER_H_ 6 #define CONTENT_RENDERER_MEDIA_ANDROID_RENDERER_MEDIA_SESSION_MANAGER_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/id_map.h" 10 #include "base/id_map.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "content/common/content_export.h" 12 #include "content/common/content_export.h"
13 #include "content/public/renderer/render_frame_observer.h" 13 #include "content/public/renderer/render_frame_observer.h"
14 #include "third_party/WebKit/public/platform/modules/mediasession/WebMediaSessio n.h" 14 #include "third_party/WebKit/public/platform/modules/mediasession/WebMediaSessio n.h"
15 15
16 namespace content { 16 namespace content {
17 17
18 class WebMediaSessionAndroid; 18 class WebMediaSessionAndroid;
19 struct MediaMetadata;
19 20
20 class CONTENT_EXPORT RendererMediaSessionManager : public RenderFrameObserver { 21 class CONTENT_EXPORT RendererMediaSessionManager : public RenderFrameObserver {
21 public: 22 public:
22 RendererMediaSessionManager(RenderFrame* render_frame); 23 RendererMediaSessionManager(RenderFrame* render_frame);
23 ~RendererMediaSessionManager() override; 24 ~RendererMediaSessionManager() override;
24 25
25 // RenderFrameObserver override. 26 // RenderFrameObserver override.
26 bool OnMessageReceived(const IPC::Message& msg) override; 27 bool OnMessageReceived(const IPC::Message& msg) override;
27 28
28 int RegisterMediaSession(WebMediaSessionAndroid* session); 29 int RegisterMediaSession(WebMediaSessionAndroid* session);
29 void UnregisterMediaSession(int session_id); 30 void UnregisterMediaSession(int session_id);
30 31
31 void Activate(int session_id, 32 void Activate(int session_id,
32 scoped_ptr<blink::WebMediaSessionActivateCallback> callback); 33 scoped_ptr<blink::WebMediaSessionActivateCallback> callback);
33 void Deactivate( 34 void Deactivate(
34 int session_id, 35 int session_id,
35 scoped_ptr<blink::WebMediaSessionDeactivateCallback> callback); 36 scoped_ptr<blink::WebMediaSessionDeactivateCallback> callback);
37 void SetMetadata(int session_id, const content::MediaMetadata& metadata);
jochen (gone - plz use gerrit) 2015/12/14 12:38:30 you're already in namespace content here
mlamouri (slow - plz ping) 2016/01/05 16:01:17 Done.
36 38
37 void OnDidActivate(int request_id, bool success); 39 void OnDidActivate(int request_id, bool success);
38 void OnDidDeactivate(int request_id); 40 void OnDidDeactivate(int request_id);
39 41
40 private: 42 private:
41 friend class WebMediaSessionTest; 43 friend class WebMediaSessionTest;
42 44
43 std::map<int, WebMediaSessionAndroid*> sessions_; 45 std::map<int, WebMediaSessionAndroid*> sessions_;
44 int next_session_id_; 46 int next_session_id_;
45 47
46 using ActivationRequests = 48 using ActivationRequests =
47 IDMap<blink::WebMediaSessionActivateCallback, IDMapOwnPointer>; 49 IDMap<blink::WebMediaSessionActivateCallback, IDMapOwnPointer>;
48 ActivationRequests pending_activation_requests_; 50 ActivationRequests pending_activation_requests_;
49 51
50 using DeactivationRequests = 52 using DeactivationRequests =
51 IDMap<blink::WebMediaSessionDeactivateCallback, IDMapOwnPointer>; 53 IDMap<blink::WebMediaSessionDeactivateCallback, IDMapOwnPointer>;
52 DeactivationRequests pending_deactivation_requests_; 54 DeactivationRequests pending_deactivation_requests_;
53 55
54 DISALLOW_COPY_AND_ASSIGN(RendererMediaSessionManager); 56 DISALLOW_COPY_AND_ASSIGN(RendererMediaSessionManager);
55 }; 57 };
56 58
57 } // namespace content 59 } // namespace content
58 60
59 #endif // CONTENT_RENDERER_MEDIA_ANDROID_RENDERER_MEDIA_SESSION_MANAGER_H_ 61 #endif // CONTENT_RENDERER_MEDIA_ANDROID_RENDERER_MEDIA_SESSION_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698