Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5330)

Unified Diff: chrome/browser/net/chrome_url_request_context.h

Issue 5912001: Add PrerenderResourceHandler and hook it into the ResourceDispatcherHost.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Another merge with trunk Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/net/chrome_url_request_context.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 93f0e373b96d3600d0d0ddc6c520dd49ecc84a37..7d0c66b9f7f231104e9308538677b4af282e5fc4 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 net::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;
@@ -165,6 +170,9 @@ class ChromeURLRequestContext : public net::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);
@@ -176,6 +184,7 @@ class ChromeURLRequestContext : public net::URLRequestContext {
// Path to the directory user scripts are stored in.
FilePath user_script_dir_path_;
+ // TODO(willchan): Make these non-refcounted.
scoped_refptr<ChromeAppCacheService> appcache_service_;
scoped_refptr<webkit_database::DatabaseTracker> database_tracker_;
scoped_refptr<ChromeCookiePolicy> chrome_cookie_policy_;
@@ -184,6 +193,7 @@ class ChromeURLRequestContext : public net::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_;
@@ -342,6 +352,7 @@ class ChromeURLRequestContextFactory {
// TODO(aa): I think this can go away now as we no longer support standalone
// user scripts.
+ // TODO(willchan): Make these non-refcounted.
FilePath user_script_dir_path_;
scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
scoped_refptr<ChromeAppCacheService> appcache_service_;
@@ -353,6 +364,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_;
« no previous file with comments | « no previous file | chrome/browser/net/chrome_url_request_context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698