Chromium Code Reviews| Index: services/ui/launcher/launcher_app.cc |
| diff --git a/services/ui/launcher/launcher_app.cc b/services/ui/launcher/launcher_app.cc |
| index cc140a791ec61d4837db7078b768255ae3e58d6d..7b4ef84387885e9e984b3c1c5c09283b480794a2 100644 |
| --- a/services/ui/launcher/launcher_app.cc |
| +++ b/services/ui/launcher/launcher_app.cc |
| @@ -32,7 +32,8 @@ void LauncherApp::Initialize(mojo::ApplicationImpl* app_impl) { |
| TRACE_EVENT0("launcher", __func__); |
| for (size_t i = 0; i < command_line->GetArgs().size(); ++i) { |
| - Launch(command_line->GetArgs()[i]); |
| + Launch(command_line->GetArgs()[i], |
| + command_line->GetSwitchValueASCII("view_associate_urls")); |
|
jeffbrown
2016/05/18 18:07:16
It might be better to split the string here so tha
mikejurka
2016/05/18 19:09:10
Doing that would require a conversion of a std::ve
|
| } |
| } |
| @@ -49,11 +50,13 @@ bool LauncherApp::ConfigureIncomingConnection( |
| return true; |
| } |
| -void LauncherApp::Launch(const mojo::String& application_url) { |
| +void LauncherApp::Launch(const mojo::String& application_url, |
| + const mojo::String& view_associate_urls) { |
| uint32_t next_id = next_id_++; |
| - std::unique_ptr<LaunchInstance> instance(new LaunchInstance( |
| - app_impl_, application_url, base::Bind(&LauncherApp::OnLaunchTermination, |
| - base::Unretained(this), next_id))); |
| + std::unique_ptr<LaunchInstance> instance( |
| + new LaunchInstance(app_impl_, application_url, view_associate_urls, |
| + base::Bind(&LauncherApp::OnLaunchTermination, |
| + base::Unretained(this), next_id))); |
| instance->Launch(); |
| launch_instances_.emplace(next_id, std::move(instance)); |
| } |