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

Side by Side Diff: content/renderer/media/android/renderer_media_session_manager.cc

Issue 1441883003: Hook up RendererMediaSessionManager with browser side (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Simplify message return path by going straight to promise 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 #include "content/renderer/media/android/renderer_media_session_manager.h" 5 #include "content/renderer/media/android/renderer_media_session_manager.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "content/common/media/media_session_messages_android.h"
9 #include "content/public/renderer/render_thread.h"
8 #include "content/renderer/media/android/webmediasession_android.h" 10 #include "content/renderer/media/android/webmediasession_android.h"
9 11
10 namespace content { 12 namespace content {
11 13
12 static const int kDefaultMediaSessionID = 0; 14 static const int kDefaultMediaSessionID = 0;
13 15
14 RendererMediaSessionManager::RendererMediaSessionManager( 16 RendererMediaSessionManager::RendererMediaSessionManager(
15 RenderFrame* render_frame) 17 RenderFrame* render_frame)
16 : RenderFrameObserver(render_frame), 18 : RenderFrameObserver(render_frame),
17 next_session_id_(kDefaultMediaSessionID + 1) {} 19 next_session_id_(kDefaultMediaSessionID + 1) {}
18 20
19 RendererMediaSessionManager::~RendererMediaSessionManager() { 21 RendererMediaSessionManager::~RendererMediaSessionManager() {
20 DCHECK(sessions_.empty()) 22 DCHECK(sessions_.empty())
21 << "RendererMediaSessionManager is owned by RenderFrameImpl and is " 23 << "RendererMediaSessionManager is owned by RenderFrameImpl and is "
22 "destroyed only after all media sessions are destroyed."; 24 "destroyed only after all media sessions are destroyed.";
23 } 25 }
24 26
27 bool RendererMediaSessionManager::OnMessageReceived(const IPC::Message& msg) {
28 bool handled = true;
29 IPC_BEGIN_MESSAGE_MAP(RendererMediaSessionManager, msg)
30 IPC_MESSAGE_HANDLER(MediaSessionMsg_DidActivate, OnDidActivate)
31 IPC_MESSAGE_HANDLER(MediaSessionMsg_DidDeactivate, OnDidDeactivate)
32 IPC_MESSAGE_UNHANDLED(handled = false)
33 IPC_END_MESSAGE_MAP()
34 return handled;
35 }
36
25 int RendererMediaSessionManager::RegisterMediaSession( 37 int RendererMediaSessionManager::RegisterMediaSession(
26 WebMediaSessionAndroid* session) { 38 WebMediaSessionAndroid* session) {
27 sessions_[next_session_id_] = session; 39 sessions_[next_session_id_] = session;
28 return next_session_id_++; 40 return next_session_id_++;
29 } 41 }
30 42
31 void RendererMediaSessionManager::UnregisterMediaSession(int session_id) { 43 void RendererMediaSessionManager::UnregisterMediaSession(int session_id) {
32 sessions_.erase(session_id); 44 sessions_.erase(session_id);
33 } 45 }
34 46
47 void RendererMediaSessionManager::Activate(
48 int session_id,
49 blink::WebMediaSessionActivateCallback* callback) {
mlamouri (slow - plz ping) 2015/12/09 12:12:19 nit: maybe this should be a scoped_ptr<> to make t
davve 2015/12/09 14:02:24 Done.
50 int request_id = pending_activation_requests_.Add(callback);
51 Send(new MediaSessionHostMsg_Activate(routing_id(), session_id, request_id));
52 }
53
54 void RendererMediaSessionManager::Deactivate(
55 int session_id,
56 blink::WebMediaSessionDeactivateCallback* callback) {
mlamouri (slow - plz ping) 2015/12/09 12:12:19 ditto
davve 2015/12/09 14:02:24 Done.
57 int request_id = pending_deactivation_requests_.Add(callback);
58 Send(
59 new MediaSessionHostMsg_Deactivate(routing_id(), session_id, request_id));
60 }
61
62 void RendererMediaSessionManager::OnDidActivate(int request_id, bool success) {
63 DCHECK(pending_activation_requests_.Lookup(request_id)) << request_id;
64 blink::WebMediaSessionActivateCallback* callback =
65 pending_activation_requests_.Lookup(request_id);
66 if (success)
67 callback->onSuccess();
68 else
69 callback->onError(
70 blink::WebMediaSessionError(blink::WebMediaSessionError::Activate));
mlamouri (slow - plz ping) 2015/12/09 12:12:19 style: you need { } if you wrap line.
davve 2015/12/09 14:02:24 Done.
71 pending_activation_requests_.Remove(request_id);
72 }
73
74 void RendererMediaSessionManager::OnDidDeactivate(int request_id) {
75 DCHECK(pending_deactivation_requests_.Lookup(request_id)) << request_id;
76 pending_deactivation_requests_.Lookup(request_id)->onSuccess();
77 pending_deactivation_requests_.Remove(request_id);
78 }
79
35 } // namespace content 80 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698