| Index: shell/application_manager/application_manager.h
|
| diff --git a/shell/application_manager/application_manager.h b/shell/application_manager/application_manager.h
|
| index 8ae6eb93091eaf802ffd1ab1317bea9fb4085d51..8aaf5bd0d5f36606ad8d897a1a00e2ffd7609a46 100644
|
| --- a/shell/application_manager/application_manager.h
|
| +++ b/shell/application_manager/application_manager.h
|
| @@ -140,6 +140,13 @@ class ApplicationManager {
|
| typedef std::map<std::string, GURL> MimeTypeToURLMap;
|
| typedef std::map<GURL, NativeRunnerFactory::Options> URLToNativeOptionsMap;
|
|
|
| + void ConnectToApplicationWithParameters(
|
| + const GURL& application_url,
|
| + const GURL& requestor_url,
|
| + InterfaceRequest<ServiceProvider> services,
|
| + ServiceProviderPtr exposed_services,
|
| + const std::vector<std::string>& parameters);
|
| +
|
| bool ConnectToRunningApplication(const GURL& resolved_url,
|
| const GURL& requestor_url,
|
| InterfaceRequest<ServiceProvider>* services,
|
| @@ -151,6 +158,7 @@ class ApplicationManager {
|
| const GURL& requestor_url,
|
| InterfaceRequest<ServiceProvider>* services,
|
| ServiceProviderPtr* exposed_services,
|
| + const std::vector<std::string>& parameters,
|
| ApplicationLoader* loader);
|
|
|
| InterfaceRequest<Application> RegisterShell(
|
| @@ -162,7 +170,8 @@ class ApplicationManager {
|
| const GURL& resolved_url,
|
| const GURL& requestor_url,
|
| InterfaceRequest<ServiceProvider> services,
|
| - ServiceProviderPtr exposed_services);
|
| + ServiceProviderPtr exposed_services,
|
| + const std::vector<std::string>& parameters);
|
|
|
| ShellImpl* GetShellImpl(const GURL& url);
|
|
|
| @@ -176,6 +185,7 @@ class ApplicationManager {
|
| const GURL& requestor_url,
|
| InterfaceRequest<ServiceProvider> services,
|
| ServiceProviderPtr exposed_services,
|
| + const std::vector<std::string>& parameters,
|
| NativeRunner::CleanupBehavior cleanup_behavior,
|
| scoped_ptr<Fetcher> fetcher);
|
|
|
| @@ -198,7 +208,7 @@ class ApplicationManager {
|
| void OnContentHandlerError(ContentHandlerConnection* content_handler);
|
|
|
| // Returns the arguments for the given url.
|
| - Array<String> GetArgsForURL(const GURL& url);
|
| + std::vector<std::string> GetArgsForURL(const GURL& url);
|
|
|
| void CleanupRunner(NativeRunner* runner);
|
|
|
|
|