Index: chrome/browser/geolocation/chrome_geolocation_permission_context_android.h |
diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context_android.h b/chrome/browser/geolocation/chrome_geolocation_permission_context_android.h |
index f3b0898c2c0c8317db752ed204209d33c2509e47..cd8e69d35e78d57cc3162b0f4c457d7c4191f5be 100644 |
--- a/chrome/browser/geolocation/chrome_geolocation_permission_context_android.h |
+++ b/chrome/browser/geolocation/chrome_geolocation_permission_context_android.h |
@@ -5,7 +5,9 @@ |
#ifndef CHROME_BROWSER_GEOLOCATION_CHROME_GEOLOCATION_PERMISSION_CONTEXT_ANDROID_H_ |
#define CHROME_BROWSER_GEOLOCATION_CHROME_GEOLOCATION_PERMISSION_CONTEXT_ANDROID_H_ |
+#include "chrome/browser/content_settings/permission_request_id.h" |
#include "chrome/browser/geolocation/chrome_geolocation_permission_context.h" |
+#include "url/gurl.h" |
namespace content { |
class WebContents; |
@@ -21,6 +23,15 @@ class ChromeGeolocationPermissionContextAndroid |
explicit ChromeGeolocationPermissionContextAndroid(Profile* profile); |
private: |
+ struct PermissionRequestInfo { |
+ PermissionRequestInfo(); |
+ |
+ PermissionRequestID id; |
+ GURL requesting_frame; |
+ bool user_gesture; |
+ GURL embedder; |
+ }; |
+ |
friend class ChromeGeolocationPermissionContext; |
virtual ~ChromeGeolocationPermissionContextAndroid(); |
@@ -29,6 +40,7 @@ class ChromeGeolocationPermissionContextAndroid |
virtual void DecidePermission(content::WebContents* web_contents, |
const PermissionRequestID& id, |
const GURL& requesting_frame, |
+ bool user_gesture, |
const GURL& embedder, |
const std::string& accept_button_label, |
base::Callback<void(bool)> callback) OVERRIDE; |
@@ -40,9 +52,7 @@ class ChromeGeolocationPermissionContextAndroid |
bool allowed) OVERRIDE; |
void ProceedDecidePermission(content::WebContents* web_contents, |
- const PermissionRequestID& id, |
- const GURL& requesting_frame, |
- const GURL& embedder, |
+ const PermissionRequestInfo& info, |
const std::string& accept_button_label, |
base::Callback<void(bool)> callback); |
@@ -50,9 +60,7 @@ class ChromeGeolocationPermissionContextAndroid |
private: |
void CheckMasterLocation(content::WebContents* web_contents, |
- const PermissionRequestID& id, |
- const GURL& requesting_frame, |
- const GURL& embedder, |
+ const PermissionRequestInfo& info, |
base::Callback<void(bool)> callback); |
DISALLOW_COPY_AND_ASSIGN(ChromeGeolocationPermissionContextAndroid); |