| Index: content/shell/shell_browser_context.h
|
| diff --git a/content/shell/shell_browser_context.h b/content/shell/shell_browser_context.h
|
| index 8805e3de83fa118d9c55cea288cb3f97f25ed984..76a88aa0fd4b3945c1118462a815411f70217dae 100644
|
| --- a/content/shell/shell_browser_context.h
|
| +++ b/content/shell/shell_browser_context.h
|
| @@ -11,12 +11,15 @@
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "content/public/browser/browser_context.h"
|
| +#include "content/public/browser/resource_context.h"
|
|
|
| namespace content {
|
|
|
| class DownloadManagerDelegate;
|
| class ResourceContext;
|
| class ShellDownloadManagerDelegate;
|
| +class ShellResourceContext;
|
| +class ShellURLRequestContextGetter;
|
|
|
| class ShellBrowserContext : public BrowserContext {
|
| public:
|
| @@ -37,10 +40,23 @@ class ShellBrowserContext : public BrowserContext {
|
| GetMediaRequestContextForStoragePartition(
|
| const FilePath& partition_path,
|
| bool in_memory) OVERRIDE;
|
| - virtual net::URLRequestContextGetter* GetRequestContextForStoragePartition(
|
| + virtual net::URLRequestContextGetter* CreateRequestContextForStoragePartition(
|
| const FilePath& partition_path,
|
| - bool in_memory) OVERRIDE;
|
| + bool in_memory,
|
| + scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| + blob_protocol_handler,
|
| + scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| + file_system_protocol_handler,
|
| + scoped_ptr<net::URLRequestJobFactory::Interceptor>
|
| + developer_protocol_handler) OVERRIDE;
|
| virtual ResourceContext* GetResourceContext() OVERRIDE;
|
| + virtual net::URLRequestContextGetter* CreateRequestContext(
|
| + scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| + blob_protocol_handler,
|
| + scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| + file_system_protocol_handler,
|
| + scoped_ptr<net::URLRequestJobFactory::Interceptor>
|
| + developer_protocol_handler) OVERRIDE;
|
| virtual GeolocationPermissionContext*
|
| GetGeolocationPermissionContext() OVERRIDE;
|
| virtual SpeechRecognitionPreferences*
|
| @@ -56,9 +72,9 @@ class ShellBrowserContext : public BrowserContext {
|
| bool ignore_certificate_errors_;
|
| base::ScopedTempDir testing_path_;
|
| FilePath path_;
|
| - scoped_ptr<ResourceContext> resource_context_;
|
| + scoped_ptr<ShellResourceContext> resource_context_;
|
| scoped_refptr<ShellDownloadManagerDelegate> download_manager_delegate_;
|
| - scoped_refptr<net::URLRequestContextGetter> url_request_getter_;
|
| + scoped_refptr<ShellURLRequestContextGetter> url_request_getter_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ShellBrowserContext);
|
| };
|
|
|