| 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_APPLICATION_MANAGER_H_ | 5 #ifndef MOJO_SHELL_APPLICATION_MANAGER_H_ |
| 6 #define MOJO_SHELL_APPLICATION_MANAGER_H_ | 6 #define MOJO_SHELL_APPLICATION_MANAGER_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 92 | 92 |
| 93 private: | 93 private: |
| 94 using IdentityToInstanceMap = std::map<Identity, ApplicationInstance*>; | 94 using IdentityToInstanceMap = std::map<Identity, ApplicationInstance*>; |
| 95 using IdentityToContentHandlerMap = | 95 using IdentityToContentHandlerMap = |
| 96 std::map<Identity, ContentHandlerConnection*>; | 96 std::map<Identity, ContentHandlerConnection*>; |
| 97 using URLToLoaderMap = std::map<GURL, ApplicationLoader*>; | 97 using URLToLoaderMap = std::map<GURL, ApplicationLoader*>; |
| 98 | 98 |
| 99 // Takes the contents of |params| only when it returns true. | 99 // Takes the contents of |params| only when it returns true. |
| 100 bool ConnectToRunningApplication( | 100 bool ConnectToRunningApplication( |
| 101 scoped_ptr<ConnectToApplicationParams>* params); | 101 scoped_ptr<ConnectToApplicationParams>* params); |
| 102 // |resolved_url| is the URL to load by |loader| (if loader is not null). It | |
| 103 // may be different from |(*params)->app_url()| because of mappings and | |
| 104 // resolution rules. | |
| 105 // Takes the contents of |params| only when it returns true. | |
| 106 void ConnectToApplicationWithLoader( | |
| 107 scoped_ptr<ConnectToApplicationParams>* params, | |
| 108 const GURL& resolved_url, | |
| 109 ApplicationLoader* loader); | |
| 110 | 102 |
| 111 InterfaceRequest<Application> CreateInstance( | 103 InterfaceRequest<Application> CreateInstance( |
| 112 scoped_ptr<ConnectToApplicationParams> params, | 104 scoped_ptr<ConnectToApplicationParams> params, |
| 113 ApplicationInstance** instance); | 105 ApplicationInstance** instance); |
| 114 | 106 |
| 115 // Called once |fetcher| has found app. |params->app_url()| is the url of | 107 // Called once |fetcher| has found app. |params->app_url()| is the url of |
| 116 // the requested application before any mappings/resolution have been applied. | 108 // the requested application before any mappings/resolution have been applied. |
| 117 // The corresponding URLRequest struct in |params| has been taken. | 109 // The corresponding URLRequest struct in |params| has been taken. |
| 118 void HandleFetchCallback(scoped_ptr<ConnectToApplicationParams> params, | 110 void HandleFetchCallback(scoped_ptr<ConnectToApplicationParams> params, |
| 119 scoped_ptr<Fetcher> fetcher); | 111 scoped_ptr<Fetcher> fetcher); |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 159 | 151 |
| 160 DISALLOW_COPY_AND_ASSIGN(ApplicationManager); | 152 DISALLOW_COPY_AND_ASSIGN(ApplicationManager); |
| 161 }; | 153 }; |
| 162 | 154 |
| 163 Shell::ConnectToApplicationCallback EmptyConnectCallback(); | 155 Shell::ConnectToApplicationCallback EmptyConnectCallback(); |
| 164 | 156 |
| 165 } // namespace shell | 157 } // namespace shell |
| 166 } // namespace mojo | 158 } // namespace mojo |
| 167 | 159 |
| 168 #endif // MOJO_SHELL_APPLICATION_MANAGER_H_ | 160 #endif // MOJO_SHELL_APPLICATION_MANAGER_H_ |
| OLD | NEW |