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

Unified Diff: content/browser/frame_host/interstitial_page_impl.cc

Issue 2758993002: Move the functions which block, resume and cancel requests for a frame route id out of ResourceDisp… (Closed)
Patch Set: Remove DCHECK for RDHI on the same lines as the old code Created 3 years, 9 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
Index: content/browser/frame_host/interstitial_page_impl.cc
diff --git a/content/browser/frame_host/interstitial_page_impl.cc b/content/browser/frame_host/interstitial_page_impl.cc
index abe1b5f0faa8b5c4704124b767818503c36d3110..185e902316cc259223e6d76cff95ee50189d714f 100644
--- a/content/browser/frame_host/interstitial_page_impl.cc
+++ b/content/browser/frame_host/interstitial_page_impl.cc
@@ -23,7 +23,6 @@
#include "content/browser/frame_host/interstitial_page_navigator_impl.h"
#include "content/browser/frame_host/navigation_controller_impl.h"
#include "content/browser/frame_host/navigation_entry_impl.h"
-#include "content/browser/loader/resource_dispatcher_host_impl.h"
#include "content/browser/renderer_host/render_process_host_impl.h"
#include "content/browser/renderer_host/render_view_host_delegate_view.h"
#include "content/browser/renderer_host/render_view_host_factory.h"
@@ -45,6 +44,7 @@
#include "content/public/browser/notification_service.h"
#include "content/public/browser/notification_source.h"
#include "content/public/browser/notification_types.h"
+#include "content/public/browser/render_frame_host.h"
#include "content/public/browser/storage_partition.h"
#include "content/public/browser/user_metrics.h"
#include "content/public/browser/web_contents_delegate.h"
@@ -848,14 +848,14 @@ void InterstitialPageImpl::TakeActionOnResourceDispatcher(
switch (action) {
case BLOCK:
- ResourceDispatcherHost::BlockRequestsForFrameFromUI(rfh);
+ RenderFrameHost::BlockRequestsForFrame(rfh);
break;
case RESUME:
- ResourceDispatcherHost::ResumeBlockedRequestsForFrameFromUI(rfh);
+ RenderFrameHost::ResumeBlockedRequestsForFrame(rfh);
break;
default:
DCHECK_EQ(action, CANCEL);
- ResourceDispatcherHostImpl::CancelBlockedRequestsForFrameFromUI(rfh);
+ RenderFrameHost::CancelBlockedRequestsForFrame(rfh);
break;
}
}
« no previous file with comments | « no previous file | content/browser/frame_host/render_frame_host_impl.cc » ('j') | content/public/browser/render_frame_host.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698