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

Unified Diff: extensions/browser/app_window/app_window_contents.cc

Issue 1542743002: [RDHI] Refactored blocked_loaders_map_ to key by render frame route id (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nasko nit Created 4 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 | « content/public/test/mock_render_process_host.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/app_window/app_window_contents.cc
diff --git a/extensions/browser/app_window/app_window_contents.cc b/extensions/browser/app_window/app_window_contents.cc
index 3419326f867c67d06df0d51c5bf462f8de4a8f41..7f1a7a1d00484bccdc0bbe8ded1cff641dbdb9a5 100644
--- a/extensions/browser/app_window/app_window_contents.cc
+++ b/extensions/browser/app_window/app_window_contents.cc
@@ -89,14 +89,8 @@ void AppWindowContentsImpl::OnWindowReady() {
is_window_ready_ = true;
if (is_blocking_requests_) {
is_blocking_requests_ = false;
- content::RenderFrameHost* frame = web_contents_->GetMainFrame();
- content::BrowserThread::PostTask(
- content::BrowserThread::IO, FROM_HERE,
- base::Bind(
- &content::ResourceDispatcherHost::ResumeBlockedRequestsForRoute,
- base::Unretained(content::ResourceDispatcherHost::Get()),
- frame->GetProcess()->GetID(),
- frame->GetRenderViewHost()->GetRoutingID()));
+ content::ResourceDispatcherHost::ResumeBlockedRequestsForFrameFromUI(
Devlin 2016/02/03 21:02:55 Yay type checking! I had a bug awhile back that t
+ web_contents_->GetMainFrame());
}
}
@@ -136,14 +130,7 @@ void AppWindowContentsImpl::SuspendRenderFrameHost(
if (is_window_ready_)
return;
is_blocking_requests_ = true;
- // The ResourceDispatcherHost only accepts RenderViewHost child ids.
- // TODO(devlin): This will need to change for site isolation.
- content::BrowserThread::PostTask(
- content::BrowserThread::IO, FROM_HERE,
- base::Bind(&content::ResourceDispatcherHost::BlockRequestsForRoute,
- base::Unretained(content::ResourceDispatcherHost::Get()),
- rfh->GetProcess()->GetID(),
- rfh->GetRenderViewHost()->GetRoutingID()));
+ content::ResourceDispatcherHost::BlockRequestsForFrameFromUI(rfh);
}
} // namespace extensions
« no previous file with comments | « content/public/test/mock_render_process_host.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698