Chromium Code Reviews| Index: mojo/shell/application_instance.cc |
| diff --git a/mojo/shell/application_instance.cc b/mojo/shell/application_instance.cc |
| index 78a3275924974aac6948faff4f03b6b7605950e6..48e244f0eb11760095699ac9fcac06ef85623509 100644 |
| --- a/mojo/shell/application_instance.cc |
| +++ b/mojo/shell/application_instance.cc |
| @@ -14,8 +14,8 @@ |
| namespace mojo { |
| namespace shell { |
| -ApplicationInstance::QueuedClientRequest::QueuedClientRequest() { |
| -} |
| +ApplicationInstance::QueuedClientRequest::QueuedClientRequest() |
| + : originator(nullptr) {} |
| ApplicationInstance::QueuedClientRequest::~QueuedClientRequest() { |
| } |
| @@ -55,13 +55,13 @@ void ApplicationInstance::ConnectToClient( |
| ServiceProviderPtr exposed_services, |
| CapabilityFilterPtr filter) { |
| if (queue_requests_) { |
| - QueuedClientRequest* queued_request = new QueuedClientRequest; |
| + QueuedClientRequest* queued_request = new QueuedClientRequest(); |
| queued_request->originator = originator; |
| queued_request->requested_url = requested_url; |
| queued_request->requestor_url = requestor_url; |
| queued_request->services = services.Pass(); |
| queued_request->exposed_services = exposed_services.Pass(); |
| - queued_request->filter = filter.Pass(), |
| + queued_request->filter = filter.Pass(); |
| queued_client_requests_.push_back(queued_request); |
| return; |
| } |
| @@ -144,7 +144,7 @@ void ApplicationInstance::OnConnectionError() { |
| for (auto request : queued_client_requests) { |
| mojo::URLRequestPtr url(mojo::URLRequest::New()); |
| url->url = mojo::String::From(request->requested_url.spec()); |
| - manager->ConnectToApplication(this, url.Pass(), std::string(), |
| + manager->ConnectToApplication(nullptr, url.Pass(), std::string(), |
|
xhwang
2015/07/25 08:12:42
This fixes the crash in my test. But I am not sure
|
| request->requestor_url, |
| request->services.Pass(), |
| request->exposed_services.Pass(), |