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

Unified Diff: content/browser/loader/resource_dispatcher_host_impl.cc

Issue 1960743002: Remove dependency of AsyncResourceLoader on content/browser/host_zoom_map_impl.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@devtoolsnetlog-loader
Patch Set: missed override Created 4 years, 7 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 | « content/browser/loader/resource_dispatcher_host_impl.h ('k') | content/content_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/loader/resource_dispatcher_host_impl.cc
diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc
index e594cb76d5aef0b6545234d41d7bfa1bb0eee8c1..a5967fcf6795aa8c482e660e7c66671c4c46549e 100644
--- a/content/browser/loader/resource_dispatcher_host_impl.cc
+++ b/content/browser/loader/resource_dispatcher_host_impl.cc
@@ -531,11 +531,6 @@ void LoaderIOThreadNotifier::RenderFrameDeleted(
base::Bind(&ResourceDispatcherHostImpl::OnRenderFrameDeleted));
}
-// static
-ResourceDispatcherHost* ResourceDispatcherHost::Get() {
- return g_resource_dispatcher_host;
-}
-
ResourceDispatcherHostImpl::ResourceDispatcherHostImpl()
: save_file_manager_(new SaveFileManager()),
request_id_(-1),
@@ -553,7 +548,15 @@ ResourceDispatcherHostImpl::ResourceDispatcherHostImpl()
DCHECK_CURRENTLY_ON(BrowserThread::UI);
DCHECK(!g_resource_dispatcher_host);
g_resource_dispatcher_host = this;
+}
+ResourceDispatcherHostImpl::~ResourceDispatcherHostImpl() {
+ DCHECK(outstanding_requests_stats_map_.empty());
+ DCHECK(g_resource_dispatcher_host);
+ g_resource_dispatcher_host = NULL;
+}
+
+void ResourceDispatcherHostImpl::Init() {
GetContentClient()->browser()->ResourceDispatcherHostCreated();
ANNOTATE_BENIGN_RACE(
@@ -579,12 +582,6 @@ ResourceDispatcherHostImpl::ResourceDispatcherHostImpl()
}
}
-ResourceDispatcherHostImpl::~ResourceDispatcherHostImpl() {
- DCHECK(outstanding_requests_stats_map_.empty());
- DCHECK(g_resource_dispatcher_host);
- g_resource_dispatcher_host = NULL;
-}
-
// static
ResourceDispatcherHostImpl* ResourceDispatcherHostImpl::Get() {
return g_resource_dispatcher_host;
« no previous file with comments | « content/browser/loader/resource_dispatcher_host_impl.h ('k') | content/content_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698