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 "services/ui/launcher/launcher_app.h" | 5 #include "services/ui/launcher/launcher_app.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/trace_event/trace_event.h" | 9 #include "base/trace_event/trace_event.h" |
10 #include "mojo/application/application_runner_chromium.h" | 10 #include "mojo/application/application_runner_chromium.h" |
(...skipping 21 matching lines...) Expand all Loading... |
32 TRACE_EVENT0("launcher", __func__); | 32 TRACE_EVENT0("launcher", __func__); |
33 | 33 |
34 for (size_t i = 0; i < command_line->GetArgs().size(); ++i) { | 34 for (size_t i = 0; i < command_line->GetArgs().size(); ++i) { |
35 Launch(command_line->GetArgs()[i]); | 35 Launch(command_line->GetArgs()[i]); |
36 } | 36 } |
37 } | 37 } |
38 | 38 |
39 bool LauncherApp::ConfigureIncomingConnection( | 39 bool LauncherApp::ConfigureIncomingConnection( |
40 mojo::ApplicationConnection* connection) { | 40 mojo::ApplicationConnection* connection) { |
41 // Only present the launcher interface to the shell. | 41 // Only present the launcher interface to the shell. |
42 if (connection->GetRemoteApplicationURL().empty()) { | 42 if (connection->GetServiceProviderImpl() |
| 43 .connection_context() |
| 44 .remote_url.empty()) { |
43 connection->AddService<Launcher>(this); | 45 connection->AddService<Launcher>(this); |
44 } | 46 } |
45 return true; | 47 return true; |
46 } | 48 } |
47 | 49 |
48 void LauncherApp::Create(const mojo::ConnectionContext& connection_context, | 50 void LauncherApp::Create(const mojo::ConnectionContext& connection_context, |
49 mojo::InterfaceRequest<Launcher> request) { | 51 mojo::InterfaceRequest<Launcher> request) { |
50 bindings_.AddBinding(this, request.Pass()); | 52 bindings_.AddBinding(this, request.Pass()); |
51 } | 53 } |
52 | 54 |
53 void LauncherApp::Launch(const mojo::String& application_url) { | 55 void LauncherApp::Launch(const mojo::String& application_url) { |
54 uint32_t next_id = next_id_++; | 56 uint32_t next_id = next_id_++; |
55 std::unique_ptr<LaunchInstance> instance(new LaunchInstance( | 57 std::unique_ptr<LaunchInstance> instance(new LaunchInstance( |
56 app_impl_, application_url, base::Bind(&LauncherApp::OnLaunchTermination, | 58 app_impl_, application_url, base::Bind(&LauncherApp::OnLaunchTermination, |
57 base::Unretained(this), next_id))); | 59 base::Unretained(this), next_id))); |
58 instance->Launch(); | 60 instance->Launch(); |
59 launch_instances_.emplace(next_id, std::move(instance)); | 61 launch_instances_.emplace(next_id, std::move(instance)); |
60 } | 62 } |
61 | 63 |
62 void LauncherApp::OnLaunchTermination(uint32_t id) { | 64 void LauncherApp::OnLaunchTermination(uint32_t id) { |
63 launch_instances_.erase(id); | 65 launch_instances_.erase(id); |
64 if (launch_instances_.empty()) { | 66 if (launch_instances_.empty()) { |
65 app_impl_->Terminate(); | 67 app_impl_->Terminate(); |
66 } | 68 } |
67 } | 69 } |
68 | 70 |
69 } // namespace launcher | 71 } // namespace launcher |
OLD | NEW |