Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(211)

Side by Side Diff: mojo/shell/application_manager.h

Issue 1143793003: Remove application-specific args from Mandoline's shell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review comments Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « mojo/application/public/interfaces/application.mojom ('k') | mojo/shell/application_manager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 SHELL_APPLICATION_MANAGER_APPLICATION_MANAGER_H_ 5 #ifndef SHELL_APPLICATION_MANAGER_APPLICATION_MANAGER_H_
6 #define SHELL_APPLICATION_MANAGER_APPLICATION_MANAGER_H_ 6 #define SHELL_APPLICATION_MANAGER_APPLICATION_MANAGER_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 147
148 using ApplicationPackagedAlias = std::map<GURL, std::pair<GURL, std::string>>; 148 using ApplicationPackagedAlias = std::map<GURL, std::pair<GURL, std::string>>;
149 using IdentityToShellImplMap = std::map<Identity, ShellImpl*>; 149 using IdentityToShellImplMap = std::map<Identity, ShellImpl*>;
150 using MimeTypeToURLMap = std::map<std::string, GURL>; 150 using MimeTypeToURLMap = std::map<std::string, GURL>;
151 using SchemeToLoaderMap = std::map<std::string, ApplicationLoader*>; 151 using SchemeToLoaderMap = std::map<std::string, ApplicationLoader*>;
152 using URLToContentHandlerMap = 152 using URLToContentHandlerMap =
153 std::map<std::pair<GURL, std::string>, ContentHandlerConnection*>; 153 std::map<std::pair<GURL, std::string>, ContentHandlerConnection*>;
154 using URLToLoaderMap = std::map<GURL, ApplicationLoader*>; 154 using URLToLoaderMap = std::map<GURL, ApplicationLoader*>;
155 using URLToNativeOptionsMap = std::map<GURL, NativeRunnerFactory::Options>; 155 using URLToNativeOptionsMap = std::map<GURL, NativeRunnerFactory::Options>;
156 156
157 void ConnectToApplicationWithParameters( 157 void ConnectToApplicationInternal(
158 const GURL& application_url, 158 const GURL& application_url,
159 const std::string& qualifier, 159 const std::string& qualifier,
160 const GURL& requestor_url, 160 const GURL& requestor_url,
161 InterfaceRequest<ServiceProvider> services, 161 InterfaceRequest<ServiceProvider> services,
162 ServiceProviderPtr exposed_services, 162 ServiceProviderPtr exposed_services,
163 const base::Closure& on_application_end, 163 const base::Closure& on_application_end);
164 const std::vector<std::string>& pre_redirect_parameters);
165 164
166 bool ConnectToRunningApplication(const GURL& resolved_url, 165 bool ConnectToRunningApplication(const GURL& resolved_url,
167 const std::string& qualifier, 166 const std::string& qualifier,
168 const GURL& requestor_url, 167 const GURL& requestor_url,
169 InterfaceRequest<ServiceProvider>* services, 168 InterfaceRequest<ServiceProvider>* services,
170 ServiceProviderPtr* exposed_services); 169 ServiceProviderPtr* exposed_services);
171 170
172 bool ConnectToApplicationWithLoader( 171 bool ConnectToApplicationWithLoader(
173 const GURL& requested_url, 172 const GURL& requested_url,
174 const std::string& qualifier, 173 const std::string& qualifier,
175 const GURL& resolved_url, 174 const GURL& resolved_url,
176 const GURL& requestor_url, 175 const GURL& requestor_url,
177 InterfaceRequest<ServiceProvider>* services, 176 InterfaceRequest<ServiceProvider>* services,
178 ServiceProviderPtr* exposed_services, 177 ServiceProviderPtr* exposed_services,
179 const base::Closure& on_application_end, 178 const base::Closure& on_application_end,
180 const std::vector<std::string>& parameters,
181 ApplicationLoader* loader); 179 ApplicationLoader* loader);
182 180
183 InterfaceRequest<Application> RegisterShell( 181 InterfaceRequest<Application> RegisterShell(
184 const GURL& app_url, 182 const GURL& app_url,
185 const std::string& qualifier, 183 const std::string& qualifier,
186 const GURL& requestor_url, 184 const GURL& requestor_url,
187 InterfaceRequest<ServiceProvider> services, 185 InterfaceRequest<ServiceProvider> services,
188 ServiceProviderPtr exposed_services, 186 ServiceProviderPtr exposed_services,
189 const base::Closure& on_application_end, 187 const base::Closure& on_application_end);
190 const std::vector<std::string>& parameters);
191 188
192 ShellImpl* GetShellImpl(const GURL& url, const std::string& qualifier); 189 ShellImpl* GetShellImpl(const GURL& url, const std::string& qualifier);
193 190
194 void ConnectToClient(ShellImpl* shell_impl, 191 void ConnectToClient(ShellImpl* shell_impl,
195 const GURL& resolved_url, 192 const GURL& resolved_url,
196 const GURL& requestor_url, 193 const GURL& requestor_url,
197 InterfaceRequest<ServiceProvider> services, 194 InterfaceRequest<ServiceProvider> services,
198 ServiceProviderPtr exposed_services); 195 ServiceProviderPtr exposed_services);
199 196
200 // Called once |fetcher| has found app. |requested_url| is the url of the 197 // Called once |fetcher| has found app. |requested_url| is the url of the
201 // requested application before any mappings/resolution have been applied. 198 // requested application before any mappings/resolution have been applied.
202 void HandleFetchCallback(const GURL& requested_url, 199 void HandleFetchCallback(const GURL& requested_url,
203 const std::string& qualifier, 200 const std::string& qualifier,
204 const GURL& requestor_url, 201 const GURL& requestor_url,
205 InterfaceRequest<ServiceProvider> services, 202 InterfaceRequest<ServiceProvider> services,
206 ServiceProviderPtr exposed_services, 203 ServiceProviderPtr exposed_services,
207 const base::Closure& on_application_end, 204 const base::Closure& on_application_end,
208 const std::vector<std::string>& parameters,
209 NativeApplicationCleanup cleanup, 205 NativeApplicationCleanup cleanup,
210 scoped_ptr<Fetcher> fetcher); 206 scoped_ptr<Fetcher> fetcher);
211 207
212 void RunNativeApplication(InterfaceRequest<Application> application_request, 208 void RunNativeApplication(InterfaceRequest<Application> application_request,
213 const NativeRunnerFactory::Options& options, 209 const NativeRunnerFactory::Options& options,
214 NativeApplicationCleanup cleanup, 210 NativeApplicationCleanup cleanup,
215 scoped_ptr<Fetcher> fetcher, 211 scoped_ptr<Fetcher> fetcher,
216 const base::FilePath& file_path, 212 const base::FilePath& file_path,
217 bool path_exists); 213 bool path_exists);
218 214
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 bool disable_cache_; 248 bool disable_cache_;
253 base::WeakPtrFactory<ApplicationManager> weak_ptr_factory_; 249 base::WeakPtrFactory<ApplicationManager> weak_ptr_factory_;
254 250
255 DISALLOW_COPY_AND_ASSIGN(ApplicationManager); 251 DISALLOW_COPY_AND_ASSIGN(ApplicationManager);
256 }; 252 };
257 253
258 } // namespace shell 254 } // namespace shell
259 } // namespace mojo 255 } // namespace mojo
260 256
261 #endif // SHELL_APPLICATION_MANAGER_APPLICATION_MANAGER_H_ 257 #endif // SHELL_APPLICATION_MANAGER_APPLICATION_MANAGER_H_
OLDNEW
« no previous file with comments | « mojo/application/public/interfaces/application.mojom ('k') | mojo/shell/application_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698