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 "mojo/shell/application_manager.h" | 5 #include "mojo/shell/application_manager.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
66 TerminateShellConnections(); | 66 TerminateShellConnections(); |
67 STLDeleteValues(&url_to_loader_); | 67 STLDeleteValues(&url_to_loader_); |
68 } | 68 } |
69 | 69 |
70 void ApplicationManager::TerminateShellConnections() { | 70 void ApplicationManager::TerminateShellConnections() { |
71 STLDeleteValues(&identity_to_instance_); | 71 STLDeleteValues(&identity_to_instance_); |
72 } | 72 } |
73 | 73 |
74 void ApplicationManager::ConnectToApplication( | 74 void ApplicationManager::ConnectToApplication( |
75 scoped_ptr<ConnectToApplicationParams> params) { | 75 scoped_ptr<ConnectToApplicationParams> params) { |
76 GURL original_url = params->app_url(); | |
77 URLRequestPtr original_url_request = params->TakeAppURLRequest(); | |
78 | |
79 TRACE_EVENT_INSTANT1("mojo_shell", "ApplicationManager::ConnectToApplication", | 76 TRACE_EVENT_INSTANT1("mojo_shell", "ApplicationManager::ConnectToApplication", |
80 TRACE_EVENT_SCOPE_THREAD, "original_url", | 77 TRACE_EVENT_SCOPE_THREAD, "original_url", |
81 original_url.spec()); | 78 params->app_url().spec()); |
82 DCHECK(original_url.is_valid()); | 79 DCHECK(params->app_url().is_valid()); |
83 DCHECK(original_url_request); | |
84 | 80 |
85 // We need to look for running instances based on both the unresolved and | 81 // Connect to an existing matching instance, if possible. |
86 // resolved urls. | |
87 if (ConnectToRunningApplication(¶ms)) | 82 if (ConnectToRunningApplication(¶ms)) |
88 return; | 83 return; |
89 | 84 |
90 GURL resolved_url = package_manager_->ResolveURL(original_url); | 85 ApplicationLoader* loader = GetLoaderForURL(params->app_url()); |
91 params->SetURLInfo(resolved_url); | |
92 if (ConnectToRunningApplication(¶ms)) | |
93 return; | |
94 | |
95 // The application is not running, let's compute the parameters. | |
96 // NOTE: Set URL info using |original_url_request| instead of |original_url| | |
97 // because it may contain more information (e.g., it is a POST request). | |
98 params->SetURLInfo(original_url_request.Pass()); | |
99 ApplicationLoader* loader = GetLoaderForURL(resolved_url); | |
100 if (loader) { | 86 if (loader) { |
101 ConnectToApplicationWithLoader(¶ms, resolved_url, loader); | 87 GURL url = params->app_url(); |
| 88 loader->Load(url, CreateInstance(params.Pass(), nullptr)); |
102 return; | 89 return; |
103 } | 90 } |
104 | 91 |
105 original_url_request = params->TakeAppURLRequest(); | 92 URLRequestPtr original_url_request = params->TakeAppURLRequest(); |
106 auto callback = | 93 auto callback = |
107 base::Bind(&ApplicationManager::HandleFetchCallback, | 94 base::Bind(&ApplicationManager::HandleFetchCallback, |
108 weak_ptr_factory_.GetWeakPtr(), base::Passed(¶ms)); | 95 weak_ptr_factory_.GetWeakPtr(), base::Passed(¶ms)); |
109 package_manager_->FetchRequest(original_url_request.Pass(), callback); | 96 package_manager_->FetchRequest(original_url_request.Pass(), callback); |
110 } | 97 } |
111 | 98 |
112 bool ApplicationManager::ConnectToRunningApplication( | 99 bool ApplicationManager::ConnectToRunningApplication( |
113 scoped_ptr<ConnectToApplicationParams>* params) { | 100 scoped_ptr<ConnectToApplicationParams>* params) { |
114 ApplicationInstance* instance = GetApplicationInstance( | 101 ApplicationInstance* instance = GetApplicationInstance( |
115 Identity((*params)->app_url(), (*params)->qualifier())); | 102 Identity((*params)->app_url(), (*params)->qualifier())); |
116 if (!instance) | 103 if (!instance) |
117 return false; | 104 return false; |
118 | 105 |
119 instance->ConnectToClient(params->Pass()); | 106 instance->ConnectToClient(params->Pass()); |
120 return true; | 107 return true; |
121 } | 108 } |
122 | 109 |
123 void ApplicationManager::ConnectToApplicationWithLoader( | |
124 scoped_ptr<ConnectToApplicationParams>* params, | |
125 const GURL& resolved_url, | |
126 ApplicationLoader* loader) { | |
127 if (!(*params)->app_url().SchemeIs("mojo")) | |
128 (*params)->SetURLInfo(resolved_url); | |
129 | |
130 loader->Load(resolved_url, CreateInstance(params->Pass(), nullptr)); | |
131 } | |
132 | |
133 InterfaceRequest<Application> ApplicationManager::CreateInstance( | 110 InterfaceRequest<Application> ApplicationManager::CreateInstance( |
134 scoped_ptr<ConnectToApplicationParams> params, | 111 scoped_ptr<ConnectToApplicationParams> params, |
135 ApplicationInstance** resulting_instance) { | 112 ApplicationInstance** resulting_instance) { |
136 Identity app_identity(params->app_url(), params->qualifier()); | 113 Identity app_identity(params->app_url(), params->qualifier()); |
137 | 114 |
138 ApplicationPtr application; | 115 ApplicationPtr application; |
139 InterfaceRequest<Application> application_request = GetProxy(&application); | 116 InterfaceRequest<Application> application_request = GetProxy(&application); |
140 ApplicationInstance* instance = new ApplicationInstance( | 117 ApplicationInstance* instance = new ApplicationInstance( |
141 application.Pass(), this, params->originator_identity(), app_identity, | 118 application.Pass(), this, params->originator_identity(), app_identity, |
142 params->filter(), Shell::kInvalidContentHandlerID, | 119 params->filter(), Shell::kInvalidContentHandlerID, |
143 params->on_application_end()); | 120 params->on_application_end()); |
144 DCHECK(identity_to_instance_.find(app_identity) == | 121 DCHECK(identity_to_instance_.find(app_identity) == |
145 identity_to_instance_.end()); | 122 identity_to_instance_.end()); |
146 identity_to_instance_[app_identity] = instance; | 123 identity_to_instance_[app_identity] = instance; |
147 instance->InitializeApplication(); | 124 instance->InitializeApplication(); |
148 instance->ConnectToClient(params.Pass()); | 125 instance->ConnectToClient(params.Pass()); |
149 if (resulting_instance) | 126 if (resulting_instance) |
150 *resulting_instance = instance; | 127 *resulting_instance = instance; |
151 return application_request.Pass(); | 128 return application_request.Pass(); |
152 } | 129 } |
153 | 130 |
154 ApplicationInstance* ApplicationManager::GetApplicationInstance( | 131 ApplicationInstance* ApplicationManager::GetApplicationInstance( |
155 const Identity& identity) const { | 132 const Identity& identity) const { |
156 const auto& instance_it = identity_to_instance_.find(identity); | 133 const auto& it = identity_to_instance_.find(identity); |
157 if (instance_it != identity_to_instance_.end()) | 134 return it != identity_to_instance_.end() ? it->second : nullptr; |
158 return instance_it->second; | |
159 return nullptr; | |
160 } | 135 } |
161 | 136 |
162 void ApplicationManager::HandleFetchCallback( | 137 void ApplicationManager::HandleFetchCallback( |
163 scoped_ptr<ConnectToApplicationParams> params, | 138 scoped_ptr<ConnectToApplicationParams> params, |
164 scoped_ptr<Fetcher> fetcher) { | 139 scoped_ptr<Fetcher> fetcher) { |
165 if (!fetcher) { | 140 if (!fetcher) { |
166 // Network error. Drop |params| to tell the requestor. | 141 // Network error. Drop |params| to tell the requestor. |
167 params->connect_callback().Run(Shell::kInvalidContentHandlerID); | 142 params->connect_callback().Run(Shell::kInvalidContentHandlerID); |
168 return; | 143 return; |
169 } | 144 } |
170 | 145 |
171 GURL redirect_url = fetcher->GetRedirectURL(); | 146 GURL redirect_url = fetcher->GetRedirectURL(); |
172 if (!redirect_url.is_empty()) { | 147 if (!redirect_url.is_empty()) { |
173 // And around we go again... Whee! | 148 // And around we go again... Whee! |
174 // TODO(sky): this loses the original URL info. | 149 // TODO(sky): this loses the original URL info. |
175 URLRequestPtr new_request = URLRequest::New(); | 150 URLRequestPtr new_request = URLRequest::New(); |
176 new_request->url = redirect_url.spec(); | 151 new_request->url = redirect_url.spec(); |
177 HttpHeaderPtr header = HttpHeader::New(); | 152 HttpHeaderPtr header = HttpHeader::New(); |
178 header->name = "Referer"; | 153 header->name = "Referer"; |
179 header->value = fetcher->GetRedirectReferer().spec(); | 154 header->value = fetcher->GetRedirectReferer().spec(); |
180 new_request->headers.push_back(header.Pass()); | 155 new_request->headers.push_back(header.Pass()); |
181 params->SetURLInfo(new_request.Pass()); | 156 params->SetURLInfo(new_request.Pass()); |
182 ConnectToApplication(params.Pass()); | 157 ConnectToApplication(params.Pass()); |
183 return; | 158 return; |
184 } | 159 } |
185 | 160 |
186 // We already checked if the application was running before we fetched it, but | 161 // We already checked if the application was running before we fetched it, but |
187 // it might have started while the fetch was outstanding. We don't want to | 162 // it might have started while the fetch was outstanding. We don't want to |
188 // have two copies of the app running, so check again. | 163 // have two copies of the app running, so check again. |
189 // | |
190 // Also, it's possible the original URL was redirected to an app that is | |
191 // already running. | |
192 if (ConnectToRunningApplication(¶ms)) | 164 if (ConnectToRunningApplication(¶ms)) |
193 return; | 165 return; |
194 | 166 |
195 if (params->app_url().scheme() != "mojo") | |
196 params->SetURLInfo(fetcher->GetURL()); | |
197 | |
198 Identity originator_identity = params->originator_identity(); | 167 Identity originator_identity = params->originator_identity(); |
199 CapabilityFilter originator_filter = params->originator_filter(); | 168 CapabilityFilter originator_filter = params->originator_filter(); |
200 CapabilityFilter filter = params->filter(); | 169 CapabilityFilter filter = params->filter(); |
201 GURL app_url = params->app_url(); | 170 GURL app_url = params->app_url(); |
202 std::string qualifier = params->qualifier(); | 171 std::string qualifier = params->qualifier(); |
203 Shell::ConnectToApplicationCallback connect_callback = | 172 Shell::ConnectToApplicationCallback connect_callback = |
204 params->connect_callback(); | 173 params->connect_callback(); |
205 params->set_connect_callback(EmptyConnectCallback()); | 174 params->set_connect_callback(EmptyConnectCallback()); |
206 ApplicationInstance* app = nullptr; | 175 ApplicationInstance* app = nullptr; |
207 InterfaceRequest<Application> request(CreateInstance(params.Pass(), &app)); | 176 InterfaceRequest<Application> request(CreateInstance(params.Pass(), &app)); |
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
341 native_runners_.erase( | 310 native_runners_.erase( |
342 std::find(native_runners_.begin(), native_runners_.end(), runner)); | 311 std::find(native_runners_.begin(), native_runners_.end(), runner)); |
343 } | 312 } |
344 | 313 |
345 Shell::ConnectToApplicationCallback EmptyConnectCallback() { | 314 Shell::ConnectToApplicationCallback EmptyConnectCallback() { |
346 return base::Bind(&OnEmptyOnConnectCallback); | 315 return base::Bind(&OnEmptyOnConnectCallback); |
347 } | 316 } |
348 | 317 |
349 } // namespace shell | 318 } // namespace shell |
350 } // namespace mojo | 319 } // namespace mojo |
OLD | NEW |