| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/shell/shell.h" | 5 #include "services/shell/shell.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 530 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 541 } | 541 } |
| 542 | 542 |
| 543 //////////////////////////////////////////////////////////////////////////////// | 543 //////////////////////////////////////////////////////////////////////////////// |
| 544 // Shell, private: | 544 // Shell, private: |
| 545 | 545 |
| 546 void Shell::InitCatalog(mojom::ShellClientPtr catalog) { | 546 void Shell::InitCatalog(mojom::ShellClientPtr catalog) { |
| 547 // TODO(beng): It'd be great to build this from the manifest, however there's | 547 // TODO(beng): It'd be great to build this from the manifest, however there's |
| 548 // a bit of a chicken-and-egg problem. | 548 // a bit of a chicken-and-egg problem. |
| 549 CapabilitySpec spec; | 549 CapabilitySpec spec; |
| 550 Interfaces interfaces; | 550 Interfaces interfaces; |
| 551 interfaces.insert("filesystem::Directory"); | 551 interfaces.insert("filesystem::mojom::Directory"); |
| 552 spec.provided["app"] = interfaces; | 552 spec.provided["app"] = interfaces; |
| 553 Instance* instance = CreateInstance(CreateShellIdentity(), | 553 Instance* instance = CreateInstance(CreateShellIdentity(), |
| 554 CreateCatalogIdentity(), | 554 CreateCatalogIdentity(), |
| 555 spec); | 555 spec); |
| 556 singletons_.insert(kCatalogName); | 556 singletons_.insert(kCatalogName); |
| 557 instance->StartWithClient(std::move(catalog)); | 557 instance->StartWithClient(std::move(catalog)); |
| 558 } | 558 } |
| 559 | 559 |
| 560 mojom::ShellResolver* Shell::GetResolver(const Identity& identity) { | 560 mojom::ShellResolver* Shell::GetResolver(const Identity& identity) { |
| 561 auto iter = identity_to_resolver_.find(identity); | 561 auto iter = identity_to_resolver_.find(identity); |
| (...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 782 | 782 |
| 783 // Now that the instance has a ShellClient, we can connect to it. | 783 // Now that the instance has a ShellClient, we can connect to it. |
| 784 instance->ConnectToClient(std::move(params)); | 784 instance->ConnectToClient(std::move(params)); |
| 785 } | 785 } |
| 786 | 786 |
| 787 base::WeakPtr<Shell> Shell::GetWeakPtr() { | 787 base::WeakPtr<Shell> Shell::GetWeakPtr() { |
| 788 return weak_ptr_factory_.GetWeakPtr(); | 788 return weak_ptr_factory_.GetWeakPtr(); |
| 789 } | 789 } |
| 790 | 790 |
| 791 } // namespace shell | 791 } // namespace shell |
| OLD | NEW |