| 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 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 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 172 mojo::InterfaceRequest<mojo::ServiceProvider>* services, | 172 mojo::InterfaceRequest<mojo::ServiceProvider>* services, |
| 173 mojo::ServiceProviderPtr* exposed_services, | 173 mojo::ServiceProviderPtr* exposed_services, |
| 174 const base::Closure& on_application_end, | 174 const base::Closure& on_application_end, |
| 175 const std::vector<std::string>& parameters, | 175 const std::vector<std::string>& parameters, |
| 176 ApplicationLoader* loader); | 176 ApplicationLoader* loader); |
| 177 | 177 |
| 178 // Creates an Identity for the service identified by |resolved_url|. | 178 // Creates an Identity for the service identified by |resolved_url|. |
| 179 // If |new_process_per_connection| is true for the URL's options, then the | 179 // If |new_process_per_connection| is true for the URL's options, then the |
| 180 // identity is unique. Otherwise, repeated invocations with the same | 180 // identity is unique. Otherwise, repeated invocations with the same |
| 181 // |resolved_url| will result in an equivalent Identity. | 181 // |resolved_url| will result in an equivalent Identity. |
| 182 Identity MakeApplicationIdentity(const GURL& resolved_url); | 182 Identity MakeApplicationIdentity(const GURL& resolved_url, |
| 183 bool with_query = false); |
| 183 | 184 |
| 184 mojo::InterfaceRequest<mojo::Application> RegisterShell( | 185 mojo::InterfaceRequest<mojo::Application> RegisterShell( |
| 185 // The URL after resolution and redirects, including the querystring. | 186 // The URL after resolution and redirects, including the querystring. |
| 186 const GURL& resolved_url, | 187 const GURL& resolved_url, |
| 187 const GURL& requestor_url, | 188 const GURL& requestor_url, |
| 188 mojo::InterfaceRequest<mojo::ServiceProvider> services, | 189 mojo::InterfaceRequest<mojo::ServiceProvider> services, |
| 189 mojo::ServiceProviderPtr exposed_services, | 190 mojo::ServiceProviderPtr exposed_services, |
| 190 const base::Closure& on_application_end, | 191 const base::Closure& on_application_end, |
| 191 const std::vector<std::string>& parameters); | 192 const std::vector<std::string>& parameters); |
| 192 | 193 |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 253 ScopedVector<NativeRunner> native_runners_; | 254 ScopedVector<NativeRunner> native_runners_; |
| 254 bool initialized_authentication_interceptor_; | 255 bool initialized_authentication_interceptor_; |
| 255 base::WeakPtrFactory<ApplicationManager> weak_ptr_factory_; | 256 base::WeakPtrFactory<ApplicationManager> weak_ptr_factory_; |
| 256 | 257 |
| 257 DISALLOW_COPY_AND_ASSIGN(ApplicationManager); | 258 DISALLOW_COPY_AND_ASSIGN(ApplicationManager); |
| 258 }; | 259 }; |
| 259 | 260 |
| 260 } // namespace shell | 261 } // namespace shell |
| 261 | 262 |
| 262 #endif // SHELL_APPLICATION_MANAGER_APPLICATION_MANAGER_H_ | 263 #endif // SHELL_APPLICATION_MANAGER_APPLICATION_MANAGER_H_ |
| OLD | NEW |