| Index: mojo/shell/dynamic_application_loader.h
|
| diff --git a/mojo/shell/dynamic_application_loader.h b/mojo/shell/dynamic_application_loader.h
|
| index 5b400b9d6b14a05c8224f0043f1d37e8f03f33dc..8e8f50b438dfc631b8a8d7fde84f787fb0725339 100644
|
| --- a/mojo/shell/dynamic_application_loader.h
|
| +++ b/mojo/shell/dynamic_application_loader.h
|
| @@ -28,6 +28,8 @@ class DynamicServiceRunner;
|
| // DynamicServiceRunner).
|
| class DynamicApplicationLoader : public ApplicationLoader {
|
| public:
|
| + typedef std::map<std::string, GURL> MimeTypeToURLMap;
|
| +
|
| DynamicApplicationLoader(
|
| Context* context,
|
| scoped_ptr<DynamicServiceRunnerFactory> runner_factory);
|
| @@ -44,13 +46,12 @@ class DynamicApplicationLoader : public ApplicationLoader {
|
| const GURL& url) OVERRIDE;
|
|
|
| private:
|
| - typedef std::map<std::string, GURL> MimeTypeToURLMap;
|
| -
|
| void LoadLocalService(const GURL& resolved_url,
|
| scoped_refptr<LoadCallbacks> callbacks);
|
| void LoadNetworkService(const GURL& resolved_url,
|
| scoped_refptr<LoadCallbacks> callbacks);
|
| void OnLoadNetworkServiceComplete(scoped_refptr<LoadCallbacks> callbacks,
|
| + URLLoaderPtr url_loader,
|
| URLResponsePtr url_response);
|
| void RunLibrary(const base::FilePath& response_file,
|
| scoped_refptr<LoadCallbacks> callbacks,
|
| @@ -61,9 +62,7 @@ class DynamicApplicationLoader : public ApplicationLoader {
|
|
|
| Context* const context_;
|
| scoped_ptr<DynamicServiceRunnerFactory> runner_factory_;
|
| - ScopedVector<DynamicServiceRunner> runners_;
|
| NetworkServicePtr network_service_;
|
| - URLLoaderPtr url_loader_;
|
| MimeTypeToURLMap mime_type_to_url_;
|
| base::WeakPtrFactory<DynamicApplicationLoader> weak_ptr_factory_;
|
|
|
|
|