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 #ifndef SHELL_APPLICATION_MANAGER_SHELL_IMPL_H_ | 5 #ifndef SHELL_APPLICATION_MANAGER_SHELL_IMPL_H_ |
6 #define SHELL_APPLICATION_MANAGER_SHELL_IMPL_H_ | 6 #define SHELL_APPLICATION_MANAGER_SHELL_IMPL_H_ |
7 | 7 |
8 #include "base/callback.h" | 8 #include "base/callback.h" |
9 #include "mojo/public/cpp/bindings/binding.h" | 9 #include "mojo/public/cpp/bindings/binding.h" |
10 #include "mojo/public/cpp/bindings/error_handler.h" | 10 #include "mojo/public/cpp/bindings/error_handler.h" |
11 #include "mojo/public/interfaces/application/application.mojom.h" | 11 #include "mojo/public/interfaces/application/application.mojom.h" |
12 #include "mojo/public/interfaces/application/shell.mojom.h" | 12 #include "mojo/public/interfaces/application/shell.mojom.h" |
13 #include "shell/application_manager/identity.h" | 13 #include "shell/application_manager/identity.h" |
14 #include "url/gurl.h" | 14 #include "url/gurl.h" |
15 | 15 |
16 namespace mojo { | |
17 namespace shell { | 16 namespace shell { |
18 | 17 |
19 class ApplicationManager; | 18 class ApplicationManager; |
20 | 19 |
21 class ShellImpl : public Shell, public ErrorHandler { | 20 class ShellImpl : public mojo::Shell, public mojo::ErrorHandler { |
22 public: | 21 public: |
23 ShellImpl(ApplicationPtr application, | 22 ShellImpl(mojo::ApplicationPtr application, |
24 ApplicationManager* manager, | 23 ApplicationManager* manager, |
25 const Identity& resolved_identity, | 24 const Identity& resolved_identity, |
26 const base::Closure& on_application_end); | 25 const base::Closure& on_application_end); |
27 | 26 |
28 ~ShellImpl() override; | 27 ~ShellImpl() override; |
29 | 28 |
30 void InitializeApplication(Array<String> args); | 29 void InitializeApplication(mojo::Array<mojo::String> args); |
31 | 30 |
32 void ConnectToClient(const GURL& requested_url, | 31 void ConnectToClient(const GURL& requested_url, |
33 const GURL& requestor_url, | 32 const GURL& requestor_url, |
34 InterfaceRequest<ServiceProvider> services, | 33 mojo::InterfaceRequest<mojo::ServiceProvider> services, |
35 ServiceProviderPtr exposed_services); | 34 mojo::ServiceProviderPtr exposed_services); |
36 | 35 |
37 Application* application() { return application_.get(); } | 36 mojo::Application* application() { return application_.get(); } |
38 const Identity& identity() const { return identity_; } | 37 const Identity& identity() const { return identity_; } |
39 base::Closure on_application_end() const { return on_application_end_; } | 38 base::Closure on_application_end() const { return on_application_end_; } |
40 | 39 |
41 private: | 40 private: |
42 // Shell implementation: | 41 // mojo::Shell implementation: |
43 void ConnectToApplication(const String& app_url, | 42 void ConnectToApplication( |
44 InterfaceRequest<ServiceProvider> services, | 43 const mojo::String& app_url, |
45 ServiceProviderPtr exposed_services) override; | 44 mojo::InterfaceRequest<mojo::ServiceProvider> services, |
| 45 mojo::ServiceProviderPtr exposed_services) override; |
46 | 46 |
47 // ErrorHandler implementation: | 47 // mojo::ErrorHandler implementation: |
48 void OnConnectionError() override; | 48 void OnConnectionError() override; |
49 | 49 |
50 ApplicationManager* const manager_; | 50 ApplicationManager* const manager_; |
51 const Identity identity_; | 51 const Identity identity_; |
52 base::Closure on_application_end_; | 52 base::Closure on_application_end_; |
53 ApplicationPtr application_; | 53 mojo::ApplicationPtr application_; |
54 Binding<Shell> binding_; | 54 mojo::Binding<mojo::Shell> binding_; |
55 | 55 |
56 DISALLOW_COPY_AND_ASSIGN(ShellImpl); | 56 DISALLOW_COPY_AND_ASSIGN(ShellImpl); |
57 }; | 57 }; |
58 | 58 |
59 } // namespace shell | 59 } // namespace shell |
60 } // namespace mojo | |
61 | 60 |
62 #endif // SHELL_APPLICATION_MANAGER_SHELL_IMPL_H_ | 61 #endif // SHELL_APPLICATION_MANAGER_SHELL_IMPL_H_ |
OLD | NEW |