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

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

Issue 2627853002: Show the search geolocation disclosure from geolocation API use. (Closed)
Patch Set: Fix tests Created 3 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
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 51f1f1b82f79550e0c762a7815d46200281611a6..40c1563f5f46d1ebc1bf1a9355189f590fdc7ed1 100644
--- a/chrome/browser/geolocation/geolocation_permission_context_android.cc
+++ b/chrome/browser/geolocation/geolocation_permission_context_android.cc
@@ -10,12 +10,14 @@
#include "base/bind.h"
#include "chrome/browser/android/location_settings.h"
#include "chrome/browser/android/location_settings_impl.h"
+#include "chrome/browser/android/search_geolocation/search_geolocation_disclosure_tab_helper.h"
#include "chrome/browser/android/search_geolocation/search_geolocation_service.h"
#include "chrome/browser/permissions/permission_request_id.h"
#include "chrome/browser/permissions/permission_update_infobar_delegate_android.h"
#include "chrome/browser/profiles/profile.h"
#include "components/infobars/core/infobar.h"
#include "content/public/browser/browser_thread.h"
+#include "content/public/browser/render_frame_host.h"
#include "content/public/browser/web_contents.h"
#include "url/gurl.h"
@@ -104,6 +106,33 @@ void GeolocationPermissionContextAndroid::CancelPermissionRequest(
GeolocationPermissionContext::CancelPermissionRequest(web_contents, id);
}
+void GeolocationPermissionContextAndroid::NotifyPermissionSet(
+ const PermissionRequestID& id,
+ const GURL& requesting_origin,
+ const GURL& embedding_origin,
+ const BrowserPermissionCallback& callback,
+ bool persist,
+ ContentSetting content_setting) {
+ GeolocationPermissionContext::NotifyPermissionSet(id, requesting_origin,
+ embedding_origin, callback,
+ persist, content_setting);
+
+ // If this is the default search origin, and the DSE Geolocation setting is
+ // being used, potentially show the disclosure.
+ if (requesting_origin == embedding_origin) {
+ content::WebContents* web_contents =
+ content::WebContents::FromRenderFrameHost(
+ content::RenderFrameHost::FromID(id.render_process_id(),
+ id.render_frame_id()));
+ SearchGeolocationDisclosureTabHelper* disclosure_helper =
+ SearchGeolocationDisclosureTabHelper::FromWebContents(web_contents);
+
+ // The tab helper can be null in tests.
+ if (disclosure_helper)
+ disclosure_helper->MaybeShowDisclosure(requesting_origin);
+ }
+}
+
void GeolocationPermissionContextAndroid::HandleUpdateAndroidPermissions(
const PermissionRequestID& id,
const GURL& requesting_frame_origin,

Powered by Google App Engine
This is Rietveld 408576698