diff options
author | cbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-15 11:23:59 +0000 |
---|---|---|
committer | cbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-15 11:23:59 +0000 |
commit | 4c154ff8753f6b9f87c289027bb00467a401be1e (patch) | |
tree | 061043819035973dab0350b83196af9c5291a538 /chrome/browser/net/chrome_url_request_context.h | |
parent | 6812c1135479958778b00bd8eb096d59e4e86035 (diff) | |
download | chromium_src-4c154ff8753f6b9f87c289027bb00467a401be1e.zip chromium_src-4c154ff8753f6b9f87c289027bb00467a401be1e.tar.gz chromium_src-4c154ff8753f6b9f87c289027bb00467a401be1e.tar.bz2 |
Move FinalStatus out of PrerenderContents, and add prerender namespace.
I had a separate CL which wanted to record cancellations of prerenders which happened prior to a PrerenderContents object being created [in the PrerenderResourceHandler].
BUG=None
TEST=trybots
Review URL: http://codereview.chromium.org/6503008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74937 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net/chrome_url_request_context.h')
-rw-r--r-- | chrome/browser/net/chrome_url_request_context.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/net/chrome_url_request_context.h b/chrome/browser/net/chrome_url_request_context.h index 494bf50..42760a1 100644 --- a/chrome/browser/net/chrome_url_request_context.h +++ b/chrome/browser/net/chrome_url_request_context.h @@ -99,7 +99,7 @@ class ChromeURLRequestContext : public net::URLRequestContext { return extension_io_event_router_; } - PrerenderManager* prerender_manager() { + prerender::PrerenderManager* prerender_manager() { return prerender_manager_.get(); } @@ -168,7 +168,7 @@ class ChromeURLRequestContext : public net::URLRequestContext { void set_extension_io_event_router(ExtensionIOEventRouter* router) { extension_io_event_router_ = router; } - void set_prerender_manager(PrerenderManager* prerender_manager) { + void set_prerender_manager(prerender::PrerenderManager* prerender_manager) { prerender_manager_ = prerender_manager; } @@ -193,7 +193,7 @@ class ChromeURLRequestContext : public net::URLRequestContext { // TODO(aa): This should use chrome/common/extensions/extension_set.h. scoped_refptr<ExtensionInfoMap> extension_info_map_; scoped_refptr<ExtensionIOEventRouter> extension_io_event_router_; - scoped_refptr<PrerenderManager> prerender_manager_; + scoped_refptr<prerender::PrerenderManager> prerender_manager_; scoped_ptr<ChromeURLDataManagerBackend> chrome_url_data_manager_backend_; bool is_off_the_record_; @@ -356,7 +356,7 @@ class ChromeURLRequestContextFactory { scoped_refptr<fileapi::FileSystemContext> file_system_context_; scoped_refptr<ExtensionInfoMap> extension_info_map_; scoped_refptr<ExtensionIOEventRouter> extension_io_event_router_; - scoped_refptr<PrerenderManager> prerender_manager_; + scoped_refptr<prerender::PrerenderManager> prerender_manager_; FilePath profile_dir_path_; |