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 "mojo/shell/application_instance.h" | 5 #include "mojo/shell/application_instance.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/stl_util.h" | 8 #include "base/stl_util.h" |
9 #include "mojo/application/public/interfaces/content_handler.mojom.h" | 9 #include "mojo/application/public/interfaces/content_handler.mojom.h" |
10 #include "mojo/common/common_type_converters.h" | 10 #include "mojo/common/common_type_converters.h" |
11 #include "mojo/common/url_type_converters.h" | 11 #include "mojo/common/url_type_converters.h" |
12 #include "mojo/shell/application_manager.h" | 12 #include "mojo/shell/application_manager.h" |
13 | 13 |
14 namespace mojo { | 14 namespace mojo { |
15 namespace shell { | 15 namespace shell { |
16 | 16 |
17 ApplicationInstance::QueuedClientRequest::QueuedClientRequest() { | 17 ApplicationInstance::QueuedClientRequest::QueuedClientRequest() |
18 } | 18 : originator(nullptr) {} |
19 | 19 |
20 ApplicationInstance::QueuedClientRequest::~QueuedClientRequest() { | 20 ApplicationInstance::QueuedClientRequest::~QueuedClientRequest() { |
21 } | 21 } |
22 | 22 |
23 ApplicationInstance::ApplicationInstance( | 23 ApplicationInstance::ApplicationInstance( |
24 ApplicationPtr application, | 24 ApplicationPtr application, |
25 ApplicationManager* manager, | 25 ApplicationManager* manager, |
26 const Identity& originator_identity, | 26 const Identity& originator_identity, |
27 const Identity& identity, | 27 const Identity& identity, |
28 const CapabilityFilter& filter, | 28 const CapabilityFilter& filter, |
(...skipping 21 matching lines...) Expand all Loading... |
50 } | 50 } |
51 | 51 |
52 void ApplicationInstance::ConnectToClient( | 52 void ApplicationInstance::ConnectToClient( |
53 ApplicationInstance* originator, | 53 ApplicationInstance* originator, |
54 const GURL& requested_url, | 54 const GURL& requested_url, |
55 const GURL& requestor_url, | 55 const GURL& requestor_url, |
56 InterfaceRequest<ServiceProvider> services, | 56 InterfaceRequest<ServiceProvider> services, |
57 ServiceProviderPtr exposed_services, | 57 ServiceProviderPtr exposed_services, |
58 CapabilityFilterPtr filter) { | 58 CapabilityFilterPtr filter) { |
59 if (queue_requests_) { | 59 if (queue_requests_) { |
60 QueuedClientRequest* queued_request = new QueuedClientRequest; | 60 QueuedClientRequest* queued_request = new QueuedClientRequest(); |
61 queued_request->originator = originator; | 61 queued_request->originator = originator; |
62 queued_request->requested_url = requested_url; | 62 queued_request->requested_url = requested_url; |
63 queued_request->requestor_url = requestor_url; | 63 queued_request->requestor_url = requestor_url; |
64 queued_request->services = services.Pass(); | 64 queued_request->services = services.Pass(); |
65 queued_request->exposed_services = exposed_services.Pass(); | 65 queued_request->exposed_services = exposed_services.Pass(); |
66 queued_request->filter = filter.Pass(), | 66 queued_request->filter = filter.Pass(); |
67 queued_client_requests_.push_back(queued_request); | 67 queued_client_requests_.push_back(queued_request); |
68 return; | 68 return; |
69 } | 69 } |
70 | 70 |
71 CallAcceptConnection(originator, requestor_url, services.Pass(), | 71 CallAcceptConnection(originator, requestor_url, services.Pass(), |
72 exposed_services.Pass(), requested_url); | 72 exposed_services.Pass(), requested_url); |
73 } | 73 } |
74 | 74 |
75 ApplicationInstance::AllowedInterfaces | 75 ApplicationInstance::AllowedInterfaces |
76 ApplicationInstance::GetAllowedInterfaces( | 76 ApplicationInstance::GetAllowedInterfaces( |
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
168 request->requestor_url, | 168 request->requestor_url, |
169 request->services.Pass(), | 169 request->services.Pass(), |
170 request->exposed_services.Pass(), | 170 request->exposed_services.Pass(), |
171 request->requested_url); | 171 request->requested_url); |
172 } | 172 } |
173 STLDeleteElements(&queued_client_requests_); | 173 STLDeleteElements(&queued_client_requests_); |
174 } | 174 } |
175 | 175 |
176 } // namespace shell | 176 } // namespace shell |
177 } // namespace mojo | 177 } // namespace mojo |
OLD | NEW |