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

Unified Diff: content/renderer/media/media_permission_dispatcher_impl.cc

Issue 1464183002: media: Simplify MediaPermissionDispatcher. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase only 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/media_permission_dispatcher_impl.cc
diff --git a/content/renderer/media/media_permission_dispatcher_impl.cc b/content/renderer/media/media_permission_dispatcher_impl.cc
deleted file mode 100644
index 64515fb44bd23028b8286a41b995cd0f6a53449a..0000000000000000000000000000000000000000
--- a/content/renderer/media/media_permission_dispatcher_impl.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/media_permission_dispatcher_impl.h"
-
-#include "base/bind.h"
-#include "base/logging.h"
-#include "base/thread_task_runner_handle.h"
-#include "content/public/common/service_registry.h"
-#include "content/public/renderer/render_frame.h"
-#include "content/renderer/media/media_permission_dispatcher_proxy.h"
-#include "third_party/WebKit/public/web/WebUserGestureIndicator.h"
-#include "url/gurl.h"
-
-namespace {
-
-using Type = media::MediaPermission::Type;
-
-content::PermissionName MediaPermissionTypeToPermissionName(Type type) {
- switch (type) {
- case Type::PROTECTED_MEDIA_IDENTIFIER:
- return content::PermissionName::PROTECTED_MEDIA_IDENTIFIER;
- case Type::AUDIO_CAPTURE:
- return content::PermissionName::AUDIO_CAPTURE;
- case Type::VIDEO_CAPTURE:
- return content::PermissionName::VIDEO_CAPTURE;
- }
- NOTREACHED();
- return content::PermissionName::PROTECTED_MEDIA_IDENTIFIER;
-}
-
-} // namespace
-
-namespace content {
-
-MediaPermissionDispatcherImpl::MediaPermissionDispatcherImpl(
- RenderFrame* render_frame)
- : RenderFrameObserver(render_frame),
- task_runner_(base::ThreadTaskRunnerHandle::Get()),
- weak_ptr_factory_(this) {}
-
-MediaPermissionDispatcherImpl::~MediaPermissionDispatcherImpl() {
- DCHECK(thread_checker().CalledOnValidThread());
-}
-
-void MediaPermissionDispatcherImpl::HasPermission(
- Type type,
- const GURL& security_origin,
- const PermissionStatusCB& permission_status_cb) {
- DCHECK(thread_checker().CalledOnValidThread());
-
- if (!permission_service_.get()) {
- render_frame()->GetServiceRegistry()->ConnectToRemoteService(
- mojo::GetProxy(&permission_service_));
- }
-
- permission_service_->HasPermission(
- MediaPermissionTypeToPermissionName(type), security_origin.spec(),
- base::Bind(&MediaPermissionDispatcherImpl::OnPermissionStatus,
- weak_ptr_factory_.GetWeakPtr(),
- RegisterCallback(permission_status_cb)));
-}
-
-void MediaPermissionDispatcherImpl::RequestPermission(
- Type type,
- const GURL& security_origin,
- const PermissionStatusCB& permission_status_cb) {
- DCHECK(thread_checker().CalledOnValidThread());
-
- if (!permission_service_.get()) {
- render_frame()->GetServiceRegistry()->ConnectToRemoteService(
- mojo::GetProxy(&permission_service_));
- }
-
- permission_service_->RequestPermission(
- MediaPermissionTypeToPermissionName(type), security_origin.spec(),
- blink::WebUserGestureIndicator::isProcessingUserGesture(),
- base::Bind(&MediaPermissionDispatcherImpl::OnPermissionStatus,
- weak_ptr_factory_.GetWeakPtr(),
- RegisterCallback(permission_status_cb)));
-}
-
-scoped_ptr<media::MediaPermission> MediaPermissionDispatcherImpl::CreateProxy(
- scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner) {
- scoped_ptr<media::MediaPermission> media_permission_proxy(
- new MediaPermissionDispatcherProxy(task_runner_, caller_task_runner,
- weak_ptr_factory_.GetWeakPtr()));
- return media_permission_proxy;
-}
-
-void MediaPermissionDispatcherImpl::OnPermissionStatus(
- uint32_t request_id,
- PermissionStatus status) {
- DCHECK(thread_checker().CalledOnValidThread());
- DeliverResult(request_id, status == PermissionStatus::GRANTED);
-}
-
-} // namespace content
« no previous file with comments | « content/renderer/media/media_permission_dispatcher_impl.h ('k') | content/renderer/media/media_permission_dispatcher_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698