chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc - Issue 2675483002: Replace PermissionType in chrome/ with ContentSettingsType

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 2675483002: Replace PermissionType in chrome/ with ContentSettingsType (Closed)

Patch Set: rebase + include content_settings_types.h more Created 3 years, 10 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 a1e8d93346b5130c302598d04995ba935d7af67a..8228d9a5cb66b05f45ec0f361f605a060183c2f3 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

@@ -11,7 +11,7 @@

#include "chrome/browser/profiles/profile.h"

#include "chrome/common/features.h"

#include "chrome/common/render_messages.h"

-#include "content/public/browser/permission_type.h"

+#include "components/content_settings/core/common/content_settings_types.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"

@@ -226,7 +226,7 @@ void ChromeWebViewPermissionHelperDelegate::OnGeolocationPermissionResponse(

Profile* profile = Profile::FromBrowserContext(

web_view_guest()->browser_context());

PermissionManager::Get(profile)->RequestPermission(

- content::PermissionType::GEOLOCATION, web_contents->GetMainFrame(),

+ CONTENT_SETTINGS_TYPE_GEOLOCATION, web_contents->GetMainFrame(),

web_view_guest()

->embedder_web_contents()

->GetLastCommittedURL()