chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc - Issue 1158813002: Use RenderFrameHost for ::RequestPermission() and ::CancelPermission().

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc

Issue 1158813002: Use RenderFrameHost for ::RequestPermission() and ::CancelPermission(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: build fixes Created 5 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 | « chrome/browser/geolocation/geolocation_permission_context_unittest.cc ('k') | chrome/browser/media/midi_permission_context.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc

diff --git a/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc b/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc

index 79fb2e090fb999382a48f2992f8ae1edb564b210..94a8ae6b005602e3919588f0982b3d566d26598f 100644

--- a/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc

+++ b/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc

@@ -12,6 +12,7 @@

#include "chrome/common/render_messages.h"

#include "components/content_settings/content/common/content_settings_messages.h"

#include "components/content_settings/core/common/permission_request_id.h"

+#include "content/public/browser/render_frame_host.h"

#include "content/public/browser/render_process_host.h"

#include "content/public/browser/render_view_host.h"

#include "content/public/browser/user_metrics.h"

@@ -221,11 +222,11 @@ void ChromeWebViewPermissionHelperDelegate::OnGeolocationPermissionResponse(

content::WebContents* web_contents =

web_view_guest()->embedder_web_contents();

int render_process_id = web_contents->GetRenderProcessHost()->GetID();

- int render_view_id = web_contents->GetRenderViewHost()->GetRoutingID();

+ int render_frame_id = web_contents->GetMainFrame()->GetRoutingID();

const PermissionRequestID request_id(

render_process_id,

- render_view_id,

+ render_frame_id,

// The geolocation permission request here is not initiated

// through WebGeolocationPermissionRequest. We are only interested

// in the fact whether the embedder/app has geolocation