OLD | NEW |
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 "mandoline/tab/frame_connection.h" | 5 #include "mandoline/tab/frame_connection.h" |
6 | 6 |
7 #include "components/clipboard/public/interfaces/clipboard.mojom.h" | 7 #include "components/clipboard/public/interfaces/clipboard.mojom.h" |
8 #include "components/resource_provider/public/interfaces/resource_provider.mojom
.h" | 8 #include "components/resource_provider/public/interfaces/resource_provider.mojom
.h" |
9 #include "components/view_manager/public/interfaces/gpu.mojom.h" | 9 #include "components/view_manager/public/interfaces/gpu.mojom.h" |
10 #include "components/view_manager/public/interfaces/surfaces.mojom.h" | 10 #include "components/view_manager/public/interfaces/surfaces.mojom.h" |
(...skipping 12 matching lines...) Expand all Loading... |
23 namespace mandoline { | 23 namespace mandoline { |
24 | 24 |
25 FrameConnection::FrameConnection() : application_connection_(nullptr) { | 25 FrameConnection::FrameConnection() : application_connection_(nullptr) { |
26 } | 26 } |
27 | 27 |
28 FrameConnection::~FrameConnection() { | 28 FrameConnection::~FrameConnection() { |
29 } | 29 } |
30 | 30 |
31 void FrameConnection::Init(mojo::ApplicationImpl* app, | 31 void FrameConnection::Init(mojo::ApplicationImpl* app, |
32 mojo::URLRequestPtr request, | 32 mojo::URLRequestPtr request, |
33 mojo::ViewManagerClientPtr* view_manage_client) { | 33 mojo::ViewTreeClientPtr* view_tree_client) { |
34 DCHECK(!application_connection_); | 34 DCHECK(!application_connection_); |
35 | 35 |
36 mojo::CapabilityFilterPtr filter(mojo::CapabilityFilter::New()); | 36 mojo::CapabilityFilterPtr filter(mojo::CapabilityFilter::New()); |
37 mojo::Array<mojo::String> resource_provider_interfaces; | 37 mojo::Array<mojo::String> resource_provider_interfaces; |
38 resource_provider_interfaces.push_back( | 38 resource_provider_interfaces.push_back( |
39 resource_provider::ResourceProvider::Name_); | 39 resource_provider::ResourceProvider::Name_); |
40 filter->filter.insert("mojo:resource_provider", | 40 filter->filter.insert("mojo:resource_provider", |
41 resource_provider_interfaces.Pass()); | 41 resource_provider_interfaces.Pass()); |
42 | 42 |
43 mojo::Array<mojo::String> network_service_interfaces; | 43 mojo::Array<mojo::String> network_service_interfaces; |
(...skipping 18 matching lines...) Expand all Loading... |
62 filter->filter.insert("mojo:view_manager", view_manager_interfaces.Pass()); | 62 filter->filter.insert("mojo:view_manager", view_manager_interfaces.Pass()); |
63 | 63 |
64 #if defined(OS_LINUX) && !defined(OS_ANDROID) | 64 #if defined(OS_LINUX) && !defined(OS_ANDROID) |
65 mojo::Array<mojo::String> font_service_interfaces; | 65 mojo::Array<mojo::String> font_service_interfaces; |
66 font_service_interfaces.push_back(font_service::FontService::Name_); | 66 font_service_interfaces.push_back(font_service::FontService::Name_); |
67 filter->filter.insert("mojo:font_service", font_service_interfaces.Pass()); | 67 filter->filter.insert("mojo:font_service", font_service_interfaces.Pass()); |
68 #endif | 68 #endif |
69 | 69 |
70 application_connection_ = app->ConnectToApplicationWithCapabilityFilter( | 70 application_connection_ = app->ConnectToApplicationWithCapabilityFilter( |
71 request.Pass(), filter.Pass()); | 71 request.Pass(), filter.Pass()); |
72 application_connection_->ConnectToService(view_manage_client); | 72 application_connection_->ConnectToService(view_tree_client); |
73 application_connection_->ConnectToService(&frame_tree_client_); | 73 application_connection_->ConnectToService(&frame_tree_client_); |
74 frame_tree_client_.set_connection_error_handler([]() { | 74 frame_tree_client_.set_connection_error_handler([]() { |
75 // TODO(sky): implement this. | 75 // TODO(sky): implement this. |
76 NOTIMPLEMENTED(); | 76 NOTIMPLEMENTED(); |
77 }); | 77 }); |
78 } | 78 } |
79 | 79 |
80 } // namespace mandoline | 80 } // namespace mandoline |
OLD | NEW |