| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/services/package_manager/loader.h" | 5 #include "mojo/services/package_manager/loader.h" |
| 6 | 6 |
| 7 #include "mojo/services/package_manager/package_manager.h" | 7 #include "mojo/services/package_manager/package_manager.h" |
| 8 #include "mojo/shell/public/cpp/shell_client.h" | 8 #include "mojo/shell/public/cpp/shell_client.h" |
| 9 #include "mojo/shell/public/cpp/shell_connection.h" | 9 #include "mojo/shell/public/cpp/shell_connection.h" |
| 10 | 10 |
| 11 namespace package_manager { | 11 namespace package_manager { |
| 12 | 12 |
| 13 Loader::Loader(base::TaskRunner* blocking_pool, | 13 Loader::Loader(base::TaskRunner* blocking_pool, |
| 14 bool register_mojo_url_schemes, | |
| 15 scoped_ptr<package_manager::ApplicationCatalogStore> app_catalog) | 14 scoped_ptr<package_manager::ApplicationCatalogStore> app_catalog) |
| 16 : blocking_pool_(blocking_pool), | 15 : blocking_pool_(blocking_pool), |
| 17 register_mojo_url_schemes_(register_mojo_url_schemes), | |
| 18 app_catalog_(std::move(app_catalog)) {} | 16 app_catalog_(std::move(app_catalog)) {} |
| 19 Loader::~Loader() {} | 17 Loader::~Loader() {} |
| 20 | 18 |
| 21 void Loader::Load(const GURL& url, | 19 void Loader::Load(const std::string& name, |
| 22 mojo::shell::mojom::ShellClientRequest request) { | 20 mojo::shell::mojom::ShellClientRequest request) { |
| 23 client_.reset(new package_manager::PackageManager( | 21 client_.reset(new package_manager::PackageManager( |
| 24 blocking_pool_, register_mojo_url_schemes_, std::move(app_catalog_))); | 22 blocking_pool_, std::move(app_catalog_))); |
| 25 connection_.reset(new mojo::ShellConnection(client_.get(), | 23 connection_.reset(new mojo::ShellConnection(client_.get(), |
| 26 std::move(request))); | 24 std::move(request))); |
| 27 } | 25 } |
| 28 | 26 |
| 29 } // namespace package_manager | 27 } // namespace package_manager |
| OLD | NEW |