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 "components/mus/android_loader.h" | 5 #include "components/mus/android_loader.h" |
6 | 6 |
7 #include "components/mus/mus_app.h" | 7 #include "components/mus/mus_app.h" |
8 #include "mojo/shell/public/cpp/application_impl.h" | 8 #include "mojo/shell/public/cpp/shell_connection.h" |
9 | 9 |
10 namespace mus { | 10 namespace mus { |
11 | 11 |
12 AndroidLoader::AndroidLoader() {} | 12 AndroidLoader::AndroidLoader() {} |
13 AndroidLoader::~AndroidLoader() {} | 13 AndroidLoader::~AndroidLoader() {} |
14 | 14 |
15 void AndroidLoader::Load( | 15 void AndroidLoader::Load( |
16 const GURL& url, | 16 const GURL& url, |
17 mojo::InterfaceRequest<mojo::shell::mojom::Application> request) { | 17 mojo::InterfaceRequest<mojo::shell::mojom::ShellClient> request) { |
18 DCHECK(request.is_pending()); | 18 DCHECK(request.is_pending()); |
19 app_.reset(new mojo::ApplicationImpl(new MandolineUIServicesApp, | 19 app_.reset(new mojo::ShellConnection(new MandolineUIServicesApp, |
20 std::move(request))); | 20 std::move(request))); |
21 } | 21 } |
22 | 22 |
23 } // namespace mus | 23 } // namespace mus |
OLD | NEW |