diff options
| author | rdevlin.cronin <rdevlin.cronin@chromium.org> | 2015-07-31 18:56:12 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-01 01:56:54 +0000 |
| commit | 10da79fd9b66f7b12bc7608d4346cceef1c741af (patch) | |
| tree | 399925267e3144e67833baa7bd26d2cbc4df2b78 /extensions/browser/app_window | |
| parent | 012a949d418b31625eaa09be3b1e965e8dfb49fa (diff) | |
| download | chromium_src-10da79fd9b66f7b12bc7608d4346cceef1c741af.zip chromium_src-10da79fd9b66f7b12bc7608d4346cceef1c741af.tar.gz chromium_src-10da79fd9b66f7b12bc7608d4346cceef1c741af.tar.bz2 | |
[Extensions] Use the RenderView id for suspending resource load for app windows
The ResourceDispatcherHost uses render view ids, rather than render frame ids
(despite the fact that the interface just says "route id"). Use render view ids
when suspending an app window's load.
BUG=515798
Review URL: https://codereview.chromium.org/1254173008
Cr-Commit-Position: refs/heads/master@{#341454}
Diffstat (limited to 'extensions/browser/app_window')
| -rw-r--r-- | extensions/browser/app_window/app_window_contents.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/extensions/browser/app_window/app_window_contents.cc b/extensions/browser/app_window/app_window_contents.cc index e2e0e29..8b95283 100644 --- a/extensions/browser/app_window/app_window_contents.cc +++ b/extensions/browser/app_window/app_window_contents.cc @@ -110,11 +110,14 @@ void AppWindowContentsImpl::UpdateDraggableRegions( void AppWindowContentsImpl::SuspendRenderFrameHost( content::RenderFrameHost* rfh) { DCHECK(rfh); + // 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->GetRoutingID())); + rfh->GetProcess()->GetID(), + rfh->GetRenderViewHost()->GetRoutingID())); } } // namespace extensions |