| 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 #ifndef MOJO_SHELL_SHELL_H_ | 5 #ifndef SERVICES_SHELL_SHELL_H_ |
| 6 #define MOJO_SHELL_SHELL_H_ | 6 #define SERVICES_SHELL_SHELL_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| 11 #include "base/macros.h" | 11 #include "base/macros.h" |
| 12 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
| 13 #include "base/memory/weak_ptr.h" | 13 #include "base/memory/weak_ptr.h" |
| 14 #include "mojo/public/cpp/bindings/binding_set.h" | 14 #include "mojo/public/cpp/bindings/binding_set.h" |
| 15 #include "mojo/public/cpp/bindings/interface_ptr_set.h" | 15 #include "mojo/public/cpp/bindings/interface_ptr_set.h" |
| 16 #include "mojo/shell/connect_params.h" | 16 #include "services/shell/connect_params.h" |
| 17 #include "mojo/shell/loader.h" | 17 #include "services/shell/loader.h" |
| 18 #include "mojo/shell/native_runner.h" | 18 #include "services/shell/native_runner.h" |
| 19 #include "mojo/shell/public/cpp/capabilities.h" | 19 #include "services/shell/public/cpp/capabilities.h" |
| 20 #include "mojo/shell/public/cpp/identity.h" | 20 #include "services/shell/public/cpp/identity.h" |
| 21 #include "mojo/shell/public/cpp/interface_factory.h" | 21 #include "services/shell/public/cpp/interface_factory.h" |
| 22 #include "mojo/shell/public/cpp/shell_client.h" | 22 #include "services/shell/public/cpp/shell_client.h" |
| 23 #include "mojo/shell/public/interfaces/connector.mojom.h" | 23 #include "services/shell/public/interfaces/connector.mojom.h" |
| 24 #include "mojo/shell/public/interfaces/interface_provider.mojom.h" | 24 #include "services/shell/public/interfaces/interface_provider.mojom.h" |
| 25 #include "mojo/shell/public/interfaces/shell.mojom.h" | 25 #include "services/shell/public/interfaces/shell.mojom.h" |
| 26 #include "mojo/shell/public/interfaces/shell_client.mojom.h" | 26 #include "services/shell/public/interfaces/shell_client.mojom.h" |
| 27 #include "mojo/shell/public/interfaces/shell_client_factory.mojom.h" | 27 #include "services/shell/public/interfaces/shell_client_factory.mojom.h" |
| 28 #include "mojo/shell/public/interfaces/shell_resolver.mojom.h" | 28 #include "services/shell/public/interfaces/shell_resolver.mojom.h" |
| 29 | 29 |
| 30 namespace mojo { | 30 namespace mojo { |
| 31 class ShellConnection; | 31 class ShellConnection; |
| 32 namespace shell { | 32 namespace shell { |
| 33 | 33 |
| 34 // Creates an identity for the Shell, used when the Shell connects to | 34 // Creates an identity for the Shell, used when the Shell connects to |
| 35 // applications. | 35 // applications. |
| 36 Identity CreateShellIdentity(); | 36 Identity CreateShellIdentity(); |
| 37 | 37 |
| 38 class Shell : public ShellClient { | 38 class Shell : public ShellClient { |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 185 base::WeakPtrFactory<Shell> weak_ptr_factory_; | 185 base::WeakPtrFactory<Shell> weak_ptr_factory_; |
| 186 | 186 |
| 187 DISALLOW_COPY_AND_ASSIGN(Shell); | 187 DISALLOW_COPY_AND_ASSIGN(Shell); |
| 188 }; | 188 }; |
| 189 | 189 |
| 190 mojom::Connector::ConnectCallback EmptyConnectCallback(); | 190 mojom::Connector::ConnectCallback EmptyConnectCallback(); |
| 191 | 191 |
| 192 } // namespace shell | 192 } // namespace shell |
| 193 } // namespace mojo | 193 } // namespace mojo |
| 194 | 194 |
| 195 #endif // MOJO_SHELL_SHELL_H_ | 195 #endif // SERVICES_SHELL_SHELL_H_ |
| OLD | NEW |