| Index: chrome/browser/geolocation/chrome_geolocation_permission_context_android.cc
|
| ===================================================================
|
| --- chrome/browser/geolocation/chrome_geolocation_permission_context_android.cc (revision 163741)
|
| +++ chrome/browser/geolocation/chrome_geolocation_permission_context_android.cc (working copy)
|
| @@ -10,7 +10,7 @@
|
| #include "content/public/browser/browser_thread.h"
|
|
|
| ChromeGeolocationPermissionContextAndroid::
|
| -ChromeGeolocationPermissionContextAndroid(Profile* profile)
|
| + ChromeGeolocationPermissionContextAndroid(Profile* profile)
|
| : ChromeGeolocationPermissionContext(profile) {
|
| }
|
|
|
| @@ -19,9 +19,7 @@
|
| }
|
|
|
| void ChromeGeolocationPermissionContextAndroid::DecidePermission(
|
| - int render_process_id,
|
| - int render_view_id,
|
| - int bridge_id,
|
| + const GeolocationPermissionRequestID& id,
|
| const GURL& requesting_frame,
|
| const GURL& embedder,
|
| base::Callback<void(bool)> callback) {
|
| @@ -31,12 +29,10 @@
|
| // This must happen before other services (e.g. tabs, extensions)
|
| // get an opportunity to allow the geolocation request.
|
| if (!profile()->GetPrefs()->GetBoolean(prefs::kGeolocationEnabled)) {
|
| - PermissionDecided(render_process_id, render_view_id, bridge_id,
|
| - requesting_frame, embedder, callback, false);
|
| + PermissionDecided(id, requesting_frame, embedder, callback, false);
|
| return;
|
| }
|
|
|
| - ChromeGeolocationPermissionContext::DecidePermission(
|
| - render_process_id, render_view_id, bridge_id,
|
| - requesting_frame, embedder, callback);
|
| + ChromeGeolocationPermissionContext::DecidePermission(id, requesting_frame,
|
| + embedder, callback);
|
| }
|
|
|