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

Unified Diff: content/renderer/media/android/renderer_media_session_manager.cc

Issue 2367393002: Migrating MediaSession messages to mojo (Closed)
Patch Set: fixed layout tests 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/android/renderer_media_session_manager.cc
diff --git a/content/renderer/media/android/renderer_media_session_manager.cc b/content/renderer/media/android/renderer_media_session_manager.cc
deleted file mode 100644
index 3d53c5d13416d57d3464c3d393d032642b9743f0..0000000000000000000000000000000000000000
--- a/content/renderer/media/android/renderer_media_session_manager.cc
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "content/renderer/media/android/renderer_media_session_manager.h"
-
-#include "base/logging.h"
-#include "base/optional.h"
-#include "content/common/media/media_metadata_sanitizer.h"
-#include "content/common/media/media_session_messages_android.h"
-#include "content/public/common/media_metadata.h"
-#include "content/public/renderer/render_thread.h"
-#include "content/renderer/media/android/webmediasession_android.h"
-
-namespace content {
-
-RendererMediaSessionManager::RendererMediaSessionManager(
- RenderFrame* render_frame)
- : RenderFrameObserver(render_frame),
- next_session_id_(blink::WebMediaSession::DefaultID + 1) {}
-
-RendererMediaSessionManager::~RendererMediaSessionManager() {
- DCHECK(sessions_.empty())
- << "RendererMediaSessionManager is owned by RenderFrameImpl and is "
- "destroyed only after all media sessions are destroyed.";
-}
-
-bool RendererMediaSessionManager::OnMessageReceived(const IPC::Message& msg) {
- bool handled = true;
- IPC_BEGIN_MESSAGE_MAP(RendererMediaSessionManager, msg)
- IPC_MESSAGE_HANDLER(MediaSessionMsg_DidActivate, OnDidActivate)
- IPC_MESSAGE_HANDLER(MediaSessionMsg_DidDeactivate, OnDidDeactivate)
- IPC_MESSAGE_UNHANDLED(handled = false)
- IPC_END_MESSAGE_MAP()
- return handled;
-}
-
-void RendererMediaSessionManager::OnDestruct() {
- delete this;
-}
-
-int RendererMediaSessionManager::RegisterMediaSession(
- WebMediaSessionAndroid* session) {
- sessions_[next_session_id_] = session;
- return next_session_id_++;
-}
-
-void RendererMediaSessionManager::UnregisterMediaSession(int session_id) {
- sessions_.erase(session_id);
-}
-
-void RendererMediaSessionManager::Activate(
- int session_id,
- std::unique_ptr<blink::WebMediaSessionActivateCallback> callback) {
- int request_id = pending_activation_requests_.Add(callback.release());
- Send(new MediaSessionHostMsg_Activate(routing_id(), session_id, request_id));
-}
-
-void RendererMediaSessionManager::Deactivate(
- int session_id,
- std::unique_ptr<blink::WebMediaSessionDeactivateCallback> callback) {
- int request_id = pending_deactivation_requests_.Add(callback.release());
- Send(
- new MediaSessionHostMsg_Deactivate(routing_id(), session_id, request_id));
-}
-
-void RendererMediaSessionManager::SetMetadata(
- int session_id, const base::Optional<MediaMetadata>& metadata) {
-
- // TODO(zqzhang): print a console warning when metadata is dirty. See
- // https://crbug.com/625244.
- Send(new MediaSessionHostMsg_SetMetadata(
- routing_id(), session_id,
- (!metadata.has_value() ||
- MediaMetadataSanitizer::CheckSanity(metadata.value()))
- ? metadata
- : MediaMetadataSanitizer::Sanitize(metadata.value())));
-}
-
-void RendererMediaSessionManager::OnDidActivate(int request_id, bool success) {
- DCHECK(pending_activation_requests_.Lookup(request_id)) << request_id;
- blink::WebMediaSessionActivateCallback* callback =
- pending_activation_requests_.Lookup(request_id);
- if (success) {
- callback->onSuccess();
- } else {
- callback->onError(
- blink::WebMediaSessionError(blink::WebMediaSessionError::Activate));
- }
- pending_activation_requests_.Remove(request_id);
-}
-
-void RendererMediaSessionManager::OnDidDeactivate(int request_id) {
- DCHECK(pending_deactivation_requests_.Lookup(request_id)) << request_id;
- pending_deactivation_requests_.Lookup(request_id)->onSuccess();
- pending_deactivation_requests_.Remove(request_id);
-}
-
-} // namespace content

Powered by Google App Engine
This is Rietveld 408576698