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

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

Issue 1031833003: Fix parameters aggregation. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 9 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 | « no previous file | shell/application_manager/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 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 typedef std::map<GURL, ContentHandlerConnection*> URLToContentHandlerMap; 138 typedef std::map<GURL, ContentHandlerConnection*> URLToContentHandlerMap;
139 typedef std::map<GURL, std::vector<std::string>> URLToArgsMap; 139 typedef std::map<GURL, std::vector<std::string>> URLToArgsMap;
140 typedef std::map<std::string, GURL> MimeTypeToURLMap; 140 typedef std::map<std::string, GURL> MimeTypeToURLMap;
141 typedef std::map<GURL, NativeRunnerFactory::Options> URLToNativeOptionsMap; 141 typedef std::map<GURL, NativeRunnerFactory::Options> URLToNativeOptionsMap;
142 142
143 void ConnectToApplicationWithParameters( 143 void ConnectToApplicationWithParameters(
144 const GURL& application_url, 144 const GURL& application_url,
145 const GURL& requestor_url, 145 const GURL& requestor_url,
146 InterfaceRequest<ServiceProvider> services, 146 InterfaceRequest<ServiceProvider> services,
147 ServiceProviderPtr exposed_services, 147 ServiceProviderPtr exposed_services,
148 const std::vector<std::string>& parameters); 148 const std::vector<std::string>& previous_parameters);
blundell 2015/03/24 10:55:21 nit: |parameters| makes sense to me as the name fo
149 149
150 bool ConnectToRunningApplication(const GURL& resolved_url, 150 bool ConnectToRunningApplication(const GURL& resolved_url,
151 const GURL& requestor_url, 151 const GURL& requestor_url,
152 InterfaceRequest<ServiceProvider>* services, 152 InterfaceRequest<ServiceProvider>* services,
153 ServiceProviderPtr* exposed_services); 153 ServiceProviderPtr* exposed_services);
154 154
155 bool ConnectToApplicationWithLoader( 155 bool ConnectToApplicationWithLoader(
156 const GURL& requested_url, 156 const GURL& requested_url,
157 const GURL& resolved_url, 157 const GURL& resolved_url,
158 const GURL& requestor_url, 158 const GURL& requestor_url,
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 bool disable_cache_; 233 bool disable_cache_;
234 base::WeakPtrFactory<ApplicationManager> weak_ptr_factory_; 234 base::WeakPtrFactory<ApplicationManager> weak_ptr_factory_;
235 235
236 DISALLOW_COPY_AND_ASSIGN(ApplicationManager); 236 DISALLOW_COPY_AND_ASSIGN(ApplicationManager);
237 }; 237 };
238 238
239 } // namespace shell 239 } // namespace shell
240 } // namespace mojo 240 } // namespace mojo
241 241
242 #endif // SHELL_APPLICATION_MANAGER_APPLICATION_MANAGER_H_ 242 #endif // SHELL_APPLICATION_MANAGER_APPLICATION_MANAGER_H_
OLDNEW
« no previous file with comments | « no previous file | shell/application_manager/application_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698