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

Side by Side Diff: media/mojo/services/mojo_media_application.cc

Issue 1209283003: FrameMojoShell provides services to mojo apps. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase only Created 5 years, 5 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 | « media/mojo/services/mojo_cdm_service.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "media/mojo/services/mojo_media_application.h" 5 #include "media/mojo/services/mojo_media_application.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "media/base/media_log.h" 8 #include "media/base/media_log.h"
9 #include "media/base/renderer_factory.h" 9 #include "media/base/renderer_factory.h"
10 #include "media/mojo/services/mojo_cdm_service.h" 10 #include "media/mojo/services/mojo_cdm_service.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 mojo::ApplicationConnection* connection) { 46 mojo::ApplicationConnection* connection) {
47 connection->AddService<mojo::ContentDecryptionModule>(this); 47 connection->AddService<mojo::ContentDecryptionModule>(this);
48 connection->AddService<mojo::MediaRenderer>(this); 48 connection->AddService<mojo::MediaRenderer>(this);
49 return true; 49 return true;
50 } 50 }
51 51
52 void MojoMediaApplication::Create( 52 void MojoMediaApplication::Create(
53 mojo::ApplicationConnection* connection, 53 mojo::ApplicationConnection* connection,
54 mojo::InterfaceRequest<mojo::ContentDecryptionModule> request) { 54 mojo::InterfaceRequest<mojo::ContentDecryptionModule> request) {
55 // The created object is owned by the pipe. 55 // The created object is owned by the pipe.
56 new MojoCdmService(&cdm_service_context_, request.Pass()); 56 new MojoCdmService(&cdm_service_context_, connection->GetServiceProvider(),
57 request.Pass());
57 } 58 }
58 59
59 void MojoMediaApplication::Create( 60 void MojoMediaApplication::Create(
60 mojo::ApplicationConnection* connection, 61 mojo::ApplicationConnection* connection,
61 mojo::InterfaceRequest<mojo::MediaRenderer> request) { 62 mojo::InterfaceRequest<mojo::MediaRenderer> request) {
62 // The created object is owned by the pipe. 63 // The created object is owned by the pipe.
63 new MojoRendererService(&cdm_service_context_, GetRendererFactory(), 64 new MojoRendererService(&cdm_service_context_, GetRendererFactory(),
64 media_log_, request.Pass()); 65 media_log_, request.Pass());
65 } 66 }
66 67
67 RendererFactory* MojoMediaApplication::GetRendererFactory() { 68 RendererFactory* MojoMediaApplication::GetRendererFactory() {
68 if (!renderer_factory_) 69 if (!renderer_factory_)
69 renderer_factory_ = MojoMediaClient::Get()->GetRendererFactory(media_log_); 70 renderer_factory_ = MojoMediaClient::Get()->GetRendererFactory(media_log_);
70 return renderer_factory_.get(); 71 return renderer_factory_.get();
71 } 72 }
72 73
73 } // namespace media 74 } // namespace media
OLDNEW
« no previous file with comments | « media/mojo/services/mojo_cdm_service.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698