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

Side by Side Diff: ui/ozone/platform/drm/mojo/drm_ipc_init_helper.cc

Issue 2011383002: Get rid of {Run,Terminate}MainApplication(), and more ApplicationDelegate conversion. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: rebased Created 4 years, 6 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 | « shell/test/pingable_app.cc ('k') | ui/ozone/public/ipc_init_helper_mojo.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "mojo/public/cpp/application/connect.h" 5 #include "mojo/public/cpp/application/connect.h"
6 #include "mojo/public/cpp/application/service_provider_impl.h" 6 #include "mojo/public/cpp/application/service_provider_impl.h"
7 #include "mojo/services/ozone_drm_gpu/interfaces/ozone_drm_gpu.mojom.h" 7 #include "mojo/services/ozone_drm_gpu/interfaces/ozone_drm_gpu.mojom.h"
8 #include "mojo/services/ozone_drm_host/interfaces/ozone_drm_host.mojom.h" 8 #include "mojo/services/ozone_drm_host/interfaces/ozone_drm_host.mojom.h"
9 #include "ui/ozone/platform/drm/mojo/drm_gpu_delegate.h" 9 #include "ui/ozone/platform/drm/mojo/drm_gpu_delegate.h"
10 #include "ui/ozone/platform/drm/mojo/drm_gpu_impl.h" 10 #include "ui/ozone/platform/drm/mojo/drm_gpu_impl.h"
11 #include "ui/ozone/platform/drm/mojo/drm_host_delegate.h" 11 #include "ui/ozone/platform/drm/mojo/drm_host_delegate.h"
12 #include "ui/ozone/platform/drm/mojo/drm_host_impl.h" 12 #include "ui/ozone/platform/drm/mojo/drm_host_impl.h"
13 #include "ui/ozone/public/ipc_init_helper_mojo.h" 13 #include "ui/ozone/public/ipc_init_helper_mojo.h"
14 14
15 namespace ui { 15 namespace ui {
16 16
17 class DrmIpcInitHelperMojo : public IpcInitHelperMojo { 17 class DrmIpcInitHelperMojo : public IpcInitHelperMojo {
18 public: 18 public:
19 DrmIpcInitHelperMojo(); 19 DrmIpcInitHelperMojo();
20 ~DrmIpcInitHelperMojo(); 20 ~DrmIpcInitHelperMojo();
21 21
22 void HostInitialize(mojo::ApplicationImpl* application) override; 22 void HostInitialize(mojo::Shell* shell) override;
23 bool HostConfigureIncomingConnection( 23 bool HostAcceptConnection(
24 mojo::ServiceProviderImpl* service_provider_impl) override; 24 mojo::ServiceProviderImpl* service_provider_impl) override;
25 25
26 void GpuInitialize(mojo::ApplicationImpl* application) override; 26 void GpuInitialize(mojo::Shell* shell) override;
27 bool GpuConfigureIncomingConnection( 27 bool GpuAcceptConnection(
28 mojo::ServiceProviderImpl* service_provider_impl) override; 28 mojo::ServiceProviderImpl* service_provider_impl) override;
29 29
30 private: 30 private:
31 mojo::OzoneDrmHostPtr ozone_drm_host_; 31 mojo::OzoneDrmHostPtr ozone_drm_host_;
32 mojo::OzoneDrmGpuPtr ozone_drm_gpu_; 32 mojo::OzoneDrmGpuPtr ozone_drm_gpu_;
33 }; 33 };
34 34
35 DrmIpcInitHelperMojo::DrmIpcInitHelperMojo() {} 35 DrmIpcInitHelperMojo::DrmIpcInitHelperMojo() {}
36 36
37 DrmIpcInitHelperMojo::~DrmIpcInitHelperMojo() {} 37 DrmIpcInitHelperMojo::~DrmIpcInitHelperMojo() {}
38 38
39 void DrmIpcInitHelperMojo::HostInitialize(mojo::ApplicationImpl* application) { 39 void DrmIpcInitHelperMojo::HostInitialize(mojo::Shell* shell) {
40 mojo::ConnectToService(application->shell(), "mojo:native_viewport_service", 40 mojo::ConnectToService(shell, "mojo:native_viewport_service",
41 GetProxy(&ozone_drm_gpu_)); 41 GetProxy(&ozone_drm_gpu_));
42 new MojoDrmHostDelegate(ozone_drm_gpu_.get()); 42 new MojoDrmHostDelegate(ozone_drm_gpu_.get());
43 } 43 }
44 44
45 void DrmIpcInitHelperMojo::GpuInitialize(mojo::ApplicationImpl* application) { 45 void DrmIpcInitHelperMojo::GpuInitialize(mojo::Shell* shell) {
46 mojo::ConnectToService(application->shell(), "mojo:native_viewport_service", 46 mojo::ConnectToService(shell, "mojo:native_viewport_service",
47 GetProxy(&ozone_drm_host_)); 47 GetProxy(&ozone_drm_host_));
48 new MojoDrmGpuDelegate(ozone_drm_host_.get()); 48 new MojoDrmGpuDelegate(ozone_drm_host_.get());
49 } 49 }
50 50
51 bool DrmIpcInitHelperMojo::HostConfigureIncomingConnection( 51 bool DrmIpcInitHelperMojo::HostAcceptConnection(
52 mojo::ServiceProviderImpl* service_provider_impl) { 52 mojo::ServiceProviderImpl* service_provider_impl) {
53 service_provider_impl->AddService<mojo::OzoneDrmHost>( 53 service_provider_impl->AddService<mojo::OzoneDrmHost>(
54 [](const mojo::ConnectionContext& connection_context, 54 [](const mojo::ConnectionContext& connection_context,
55 mojo::InterfaceRequest<mojo::OzoneDrmHost> request) { 55 mojo::InterfaceRequest<mojo::OzoneDrmHost> request) {
56 new MojoDrmHostImpl(request.Pass()); 56 new MojoDrmHostImpl(request.Pass());
57 }); 57 });
58 return true; 58 return true;
59 } 59 }
60 60
61 bool DrmIpcInitHelperMojo::GpuConfigureIncomingConnection( 61 bool DrmIpcInitHelperMojo::GpuAcceptConnection(
62 mojo::ServiceProviderImpl* service_provider_impl) { 62 mojo::ServiceProviderImpl* service_provider_impl) {
63 service_provider_impl->AddService<mojo::OzoneDrmGpu>( 63 service_provider_impl->AddService<mojo::OzoneDrmGpu>(
64 [](const mojo::ConnectionContext& connection_context, 64 [](const mojo::ConnectionContext& connection_context,
65 mojo::InterfaceRequest<mojo::OzoneDrmGpu> request) { 65 mojo::InterfaceRequest<mojo::OzoneDrmGpu> request) {
66 new MojoDrmGpuImpl(request.Pass()); 66 new MojoDrmGpuImpl(request.Pass());
67 }); 67 });
68 return true; 68 return true;
69 } 69 }
70 70
71 // static 71 // static
72 IpcInitHelperOzone* IpcInitHelperOzone::Create() { 72 IpcInitHelperOzone* IpcInitHelperOzone::Create() {
73 return new DrmIpcInitHelperMojo(); 73 return new DrmIpcInitHelperMojo();
74 } 74 }
75 75
76 } // namespace ui 76 } // namespace ui
OLDNEW
« no previous file with comments | « shell/test/pingable_app.cc ('k') | ui/ozone/public/ipc_init_helper_mojo.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698