| Index: chrome/browser/net/chrome_url_request_context.h
|
| diff --git a/chrome/browser/net/chrome_url_request_context.h b/chrome/browser/net/chrome_url_request_context.h
|
| index 4d57242718a04070f1e4c3a2c9708c5662ba089f..99e43e1e35031aaeea283ff7565b7450ac91ea52 100644
|
| --- a/chrome/browser/net/chrome_url_request_context.h
|
| +++ b/chrome/browser/net/chrome_url_request_context.h
|
| @@ -19,6 +19,7 @@
|
| #include "chrome/browser/net/chrome_cookie_policy.h"
|
| #include "chrome/browser/prefs/pref_change_registrar.h"
|
| #include "chrome/browser/prefs/pref_service.h"
|
| +#include "chrome/browser/prerender/prerender_manager.h"
|
| #include "chrome/common/extensions/extension_icon_set.h"
|
| #include "chrome/common/net/url_request_context_getter.h"
|
| #include "chrome/common/notification_registrar.h"
|
| @@ -94,6 +95,10 @@ class ChromeURLRequestContext : public URLRequestContext {
|
| return extension_info_map_;
|
| }
|
|
|
| + PrerenderManager* prerender_manager() {
|
| + return prerender_manager_.get();
|
| + }
|
| +
|
| // Returns true if this context is an external request context, like
|
| // ChromeFrame.
|
| virtual bool IsExternal() const;
|
| @@ -193,6 +198,9 @@ class ChromeURLRequestContext : public URLRequestContext {
|
| net::HttpNetworkDelegate* network_delegate) {
|
| network_delegate_ = network_delegate;
|
| }
|
| + void set_prerender_manager(PrerenderManager* prerender_manager) {
|
| + prerender_manager_ = prerender_manager;
|
| + }
|
|
|
| // Callback for when the accept language changes.
|
| void OnAcceptLanguageChange(const std::string& accept_language);
|
| @@ -212,6 +220,7 @@ class ChromeURLRequestContext : public URLRequestContext {
|
| scoped_refptr<ChromeBlobStorageContext> blob_storage_context_;
|
| scoped_refptr<fileapi::SandboxedFileSystemContext> file_system_context_;
|
| scoped_refptr<ExtensionInfoMap> extension_info_map_;
|
| + scoped_refptr<PrerenderManager> prerender_manager_;
|
|
|
| bool is_media_;
|
| bool is_off_the_record_;
|
| @@ -381,6 +390,7 @@ class ChromeURLRequestContextFactory {
|
| scoped_refptr<ChromeBlobStorageContext> blob_storage_context_;
|
| scoped_refptr<fileapi::SandboxedFileSystemContext> file_system_context_;
|
| scoped_refptr<ExtensionInfoMap> extension_info_map_;
|
| + scoped_refptr<PrerenderManager> prerender_manager_;
|
|
|
| FilePath profile_dir_path_;
|
|
|
|
|