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

Unified Diff: chrome/browser/geolocation/geolocation_permission_context_android.cc

Issue 2723983004: Add PermissionManager::GetPermissionStatusForFrame function (Closed)
Patch Set: Add PermissionManager::GetPermissionStatusForFrame function 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: chrome/browser/geolocation/geolocation_permission_context_android.cc
diff --git a/chrome/browser/geolocation/geolocation_permission_context_android.cc b/chrome/browser/geolocation/geolocation_permission_context_android.cc
index ed7edd5ec387ce6020ee530f383520a5efca1351..d13cd8d2a6816630df6274a832b7026824579949 100644
--- a/chrome/browser/geolocation/geolocation_permission_context_android.cc
+++ b/chrome/browser/geolocation/geolocation_permission_context_android.cc
@@ -38,11 +38,12 @@ GeolocationPermissionContextAndroid::~GeolocationPermissionContextAndroid() {
}
ContentSetting GeolocationPermissionContextAndroid::GetPermissionStatusInternal(
+ content::RenderFrameHost* render_frame_host,
const GURL& requesting_origin,
const GURL& embedding_origin) const {
ContentSetting value =
GeolocationPermissionContext::GetPermissionStatusInternal(
- requesting_origin, embedding_origin);
+ render_frame_host, requesting_origin, embedding_origin);
if (value == CONTENT_SETTING_ASK && requesting_origin == embedding_origin) {
// Consult the DSE Geolocation setting. Note that this only needs to be
@@ -93,8 +94,9 @@ void GeolocationPermissionContextAndroid::RequestPermission(
GURL embedding_origin = web_contents->GetLastCommittedURL().GetOrigin();
ContentSetting content_setting =
- GeolocationPermissionContext::GetPermissionStatus(requesting_frame_origin,
- embedding_origin)
+ GeolocationPermissionContext::GetPermissionStatus(
+ nullptr /* render_frame_host */, requesting_frame_origin,
+ embedding_origin)
.content_setting;
std::vector<ContentSettingsType> content_settings_types;
content_settings_types.push_back(CONTENT_SETTINGS_TYPE_GEOLOCATION);

Powered by Google App Engine
This is Rietveld 408576698