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

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

Issue 1441883003: Hook up RendererMediaSessionManager with browser side (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Clang compile fix 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/webmediasession_android.h" 5 #include "content/renderer/media/android/webmediasession_android.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "content/renderer/media/android/renderer_media_session_manager.h" 9 #include "content/renderer/media/android/renderer_media_session_manager.h"
10 10
11 namespace content { 11 namespace content {
12 12
13 WebMediaSessionAndroid::WebMediaSessionAndroid( 13 WebMediaSessionAndroid::WebMediaSessionAndroid(
14 RendererMediaSessionManager* session_manager) 14 RendererMediaSessionManager* session_manager)
15 : session_manager_(session_manager) { 15 : session_manager_(session_manager), next_action_id_(0) {
16 DCHECK(session_manager_); 16 DCHECK(session_manager_);
17 session_id_ = session_manager_->RegisterMediaSession(this); 17 session_id_ = session_manager_->RegisterMediaSession(this);
18 } 18 }
19 19
20 WebMediaSessionAndroid::~WebMediaSessionAndroid() { 20 WebMediaSessionAndroid::~WebMediaSessionAndroid() {
21 session_manager_->UnregisterMediaSession(session_id_); 21 session_manager_->UnregisterMediaSession(session_id_);
22 } 22 }
23 23
24 void WebMediaSessionAndroid::activate( 24 void WebMediaSessionAndroid::activate(
25 blink::WebMediaSessionActivateCallback* raw_callback) { 25 blink::WebMediaSessionActivateCallback* raw_callback) {
26 NOTIMPLEMENTED(); 26 int action_id = next_action_id_++;
mlamouri (slow - plz ping) 2015/11/30 12:38:20 What the |action_id| is? Should that be a request_
davve 2015/11/30 14:19:48 Yes. Passed through to map OnDidActivate to the co
27 actions_[action_id].activate = raw_callback;
27 28
28 scoped_ptr<blink::WebMediaSessionActivateCallback> callback(raw_callback); 29 session_manager_->Activate(session_id_, action_id);
29 callback->onError(blink::WebMediaSessionError::Activate);
30 } 30 }
31 31
32 void WebMediaSessionAndroid::deactivate( 32 void WebMediaSessionAndroid::deactivate(
33 blink::WebMediaSessionDeactivateCallback* raw_callback) { 33 blink::WebMediaSessionDeactivateCallback* raw_callback) {
34 NOTIMPLEMENTED(); 34 int action_id = next_action_id_++;
35 actions_[action_id].deactivate = raw_callback;
36 session_manager_->Deactivate(session_id_, action_id);
37 }
35 38
36 scoped_ptr<blink::WebMediaSessionDeactivateCallback> callback(raw_callback); 39 void WebMediaSessionAndroid::OnDidActivate(int action_id, bool success) {
37 callback->onSuccess(); 40 auto iter = actions_.find(action_id);
41 if (iter != actions_.end()) {
42 if (success)
43 iter->second.activate->onSuccess();
44 else
45 iter->second.activate->onError(
46 blink::WebMediaSessionError(blink::WebMediaSessionError::Activate));
47 delete iter->second.activate;
48 actions_.erase(iter);
49 }
50 }
51
52 void WebMediaSessionAndroid::OnDidDeactivate(int action_id) {
53 auto iter = actions_.find(action_id);
54 if (iter != actions_.end()) {
55 iter->second.deactivate->onSuccess();
56 delete iter->second.deactivate;
57 actions_.erase(iter);
58 }
38 } 59 }
39 60
40 } // namespace content 61 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698