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

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 840473002: media: Support creation and SetCdm() for mojo based CDM. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix TODO. Created 5 years, 9 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 unified diff | Download patch
« no previous file with comments | « no previous file | media/base/cdm_context.h » ('j') | media/base/cdm_context.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/browser/frame_host/render_frame_host_impl.h" 5 #include "content/browser/frame_host/render_frame_host_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/containers/hash_tables.h" 9 #include "base/containers/hash_tables.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 1434 matching lines...) Expand 10 before | Expand all | Expand 10 after
1445 RenderViewHostDelegateView* view = 1445 RenderViewHostDelegateView* view =
1446 render_view_host_->delegate_->GetDelegateView(); 1446 render_view_host_->delegate_->GetDelegateView();
1447 if (view) 1447 if (view)
1448 view->HidePopupMenu(); 1448 view->HidePopupMenu();
1449 } 1449 }
1450 #endif 1450 #endif
1451 1451
1452 #if defined(ENABLE_MEDIA_MOJO_RENDERER) 1452 #if defined(ENABLE_MEDIA_MOJO_RENDERER)
1453 static void CreateMediaRendererService( 1453 static void CreateMediaRendererService(
1454 mojo::InterfaceRequest<mojo::MediaRenderer> request) { 1454 mojo::InterfaceRequest<mojo::MediaRenderer> request) {
1455 media::MojoRendererService* service = new media::MojoRendererService(); 1455 media::MojoRendererService* service = new media::MojoRendererService(nullptr);
1456 mojo::BindToRequest(service, &request); 1456 mojo::BindToRequest(service, &request);
1457 } 1457 }
1458 #endif 1458 #endif
1459 1459
1460 void RenderFrameHostImpl::RegisterMojoServices() { 1460 void RenderFrameHostImpl::RegisterMojoServices() {
1461 GeolocationServiceContext* geolocation_service_context = 1461 GeolocationServiceContext* geolocation_service_context =
1462 delegate_ ? delegate_->GetGeolocationServiceContext() : NULL; 1462 delegate_ ? delegate_->GetGeolocationServiceContext() : NULL;
1463 if (geolocation_service_context) { 1463 if (geolocation_service_context) {
1464 // TODO(creis): Bind process ID here so that GeolocationServiceImpl 1464 // TODO(creis): Bind process ID here so that GeolocationServiceImpl
1465 // can perform permissions checks once site isolation is complete. 1465 // can perform permissions checks once site isolation is complete.
(...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after
1970 void RenderFrameHostImpl::DidUseGeolocationPermission() { 1970 void RenderFrameHostImpl::DidUseGeolocationPermission() {
1971 RenderFrameHost* top_frame = frame_tree_node()->frame_tree()->GetMainFrame(); 1971 RenderFrameHost* top_frame = frame_tree_node()->frame_tree()->GetMainFrame();
1972 GetContentClient()->browser()->RegisterPermissionUsage( 1972 GetContentClient()->browser()->RegisterPermissionUsage(
1973 PERMISSION_GEOLOCATION, 1973 PERMISSION_GEOLOCATION,
1974 delegate_->GetAsWebContents(), 1974 delegate_->GetAsWebContents(),
1975 GetLastCommittedURL().GetOrigin(), 1975 GetLastCommittedURL().GetOrigin(),
1976 top_frame->GetLastCommittedURL().GetOrigin()); 1976 top_frame->GetLastCommittedURL().GetOrigin());
1977 } 1977 }
1978 1978
1979 } // namespace content 1979 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | media/base/cdm_context.h » ('j') | media/base/cdm_context.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698