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 CONTENT_BROWSER_MOJO_MOJO_SHELL_CONTEXT_H_ | 5 #ifndef CONTENT_BROWSER_MOJO_MOJO_SHELL_CONTEXT_H_ |
6 #define CONTENT_BROWSER_MOJO_MOJO_SHELL_CONTEXT_H_ | 6 #define CONTENT_BROWSER_MOJO_MOJO_SHELL_CONTEXT_H_ |
7 | 7 |
8 #include <map> | 8 #include <map> |
9 | 9 |
10 #include "base/callback_forward.h" | 10 #include "base/callback_forward.h" |
11 #include "base/compiler_specific.h" | 11 #include "base/compiler_specific.h" |
12 #include "base/lazy_instance.h" | 12 #include "base/lazy_instance.h" |
13 #include "base/macros.h" | 13 #include "base/macros.h" |
14 #include "base/memory/scoped_ptr.h" | 14 #include "base/memory/scoped_ptr.h" |
15 #include "content/common/content_export.h" | 15 #include "content/common/content_export.h" |
| 16 #include "mojo/application/public/interfaces/shell.mojom.h" |
16 #include "mojo/shell/application_manager.h" | 17 #include "mojo/shell/application_manager.h" |
17 | 18 |
18 class GURL; | 19 class GURL; |
19 | 20 |
20 namespace mojo { | 21 namespace mojo { |
21 class ApplicationDelegate; | 22 class ApplicationDelegate; |
22 } | 23 } |
23 | 24 |
24 namespace content { | 25 namespace content { |
25 | 26 |
(...skipping 10 matching lines...) Expand all Loading... |
36 | 37 |
37 // Connects an application at |url| and gets a handle to its exposed services. | 38 // Connects an application at |url| and gets a handle to its exposed services. |
38 // This is only intended for use in browser code that's not part of some Mojo | 39 // This is only intended for use in browser code that's not part of some Mojo |
39 // application. May be called from any thread. |requestor_url| is given to | 40 // application. May be called from any thread. |requestor_url| is given to |
40 // the target application as the requestor's URL upon connection. | 41 // the target application as the requestor's URL upon connection. |
41 static void ConnectToApplication( | 42 static void ConnectToApplication( |
42 const GURL& url, | 43 const GURL& url, |
43 const GURL& requestor_url, | 44 const GURL& requestor_url, |
44 mojo::InterfaceRequest<mojo::ServiceProvider> request, | 45 mojo::InterfaceRequest<mojo::ServiceProvider> request, |
45 mojo::ServiceProviderPtr exposed_services, | 46 mojo::ServiceProviderPtr exposed_services, |
46 const mojo::shell::CapabilityFilter& filter); | 47 const mojo::shell::CapabilityFilter& filter, |
| 48 const mojo::Shell::ConnectToApplicationCallback& callback); |
47 | 49 |
48 static void SetApplicationsForTest(const StaticApplicationMap* apps); | 50 static void SetApplicationsForTest(const StaticApplicationMap* apps); |
49 | 51 |
50 private: | 52 private: |
51 class Proxy; | 53 class Proxy; |
52 friend class Proxy; | 54 friend class Proxy; |
53 | 55 |
54 void ConnectToApplicationOnOwnThread( | 56 void ConnectToApplicationOnOwnThread( |
55 const GURL& url, | 57 const GURL& url, |
56 const GURL& requestor_url, | 58 const GURL& requestor_url, |
57 mojo::InterfaceRequest<mojo::ServiceProvider> request, | 59 mojo::InterfaceRequest<mojo::ServiceProvider> request, |
58 mojo::ServiceProviderPtr exposed_services, | 60 mojo::ServiceProviderPtr exposed_services, |
59 const mojo::shell::CapabilityFilter& filter); | 61 const mojo::shell::CapabilityFilter& filter, |
| 62 const mojo::Shell::ConnectToApplicationCallback& callback); |
60 | 63 |
61 // mojo::shell::ApplicationManager::Delegate: | 64 // mojo::shell::ApplicationManager::Delegate: |
62 GURL ResolveMappings(const GURL& url) override; | 65 GURL ResolveMappings(const GURL& url) override; |
63 GURL ResolveMojoURL(const GURL& url) override; | 66 GURL ResolveMojoURL(const GURL& url) override; |
64 bool CreateFetcher( | 67 bool CreateFetcher( |
65 const GURL& url, | 68 const GURL& url, |
66 const mojo::shell::Fetcher::FetchCallback& loader_callback) override; | 69 const mojo::shell::Fetcher::FetchCallback& loader_callback) override; |
67 | 70 |
68 static base::LazyInstance<scoped_ptr<Proxy>> proxy_; | 71 static base::LazyInstance<scoped_ptr<Proxy>> proxy_; |
69 | 72 |
70 scoped_ptr<mojo::shell::ApplicationManager> application_manager_; | 73 scoped_ptr<mojo::shell::ApplicationManager> application_manager_; |
71 | 74 |
72 DISALLOW_COPY_AND_ASSIGN(MojoShellContext); | 75 DISALLOW_COPY_AND_ASSIGN(MojoShellContext); |
73 }; | 76 }; |
74 | 77 |
75 } // namespace content | 78 } // namespace content |
76 | 79 |
77 #endif // CONTENT_BROWSER_MOJO_MOJO_SHELL_CONTEXT_H_ | 80 #endif // CONTENT_BROWSER_MOJO_MOJO_SHELL_CONTEXT_H_ |
OLD | NEW |