| Index: content/renderer/geolocation_dispatcher.cc
|
| diff --git a/content/renderer/geolocation_dispatcher.cc b/content/renderer/geolocation_dispatcher.cc
|
| index bc72ef822c156bfbdc5f5fa2422dc174e9149c45..59f0d44a987cc136eebf86e5af82c4d0f6534eb0 100644
|
| --- a/content/renderer/geolocation_dispatcher.cc
|
| +++ b/content/renderer/geolocation_dispatcher.cc
|
| @@ -80,7 +80,7 @@ void GeolocationDispatcher::requestPermission(
|
| int permission_request_id = pending_permissions_->add(permissionRequest);
|
|
|
| permission_service_->RequestPermission(
|
| - PermissionName::GEOLOCATION,
|
| + mojom::PermissionName::GEOLOCATION,
|
| permissionRequest.getSecurityOrigin().toString().utf8(),
|
| base::Bind(&GeolocationDispatcher::OnPermissionSet,
|
| base::Unretained(this), permission_request_id));
|
| @@ -93,14 +93,13 @@ void GeolocationDispatcher::cancelPermissionRequest(
|
| }
|
|
|
| // Permission for using geolocation has been set.
|
| -void GeolocationDispatcher::OnPermissionSet(
|
| - int permission_request_id,
|
| - PermissionStatus status) {
|
| +void GeolocationDispatcher::OnPermissionSet(int permission_request_id,
|
| + mojom::PermissionStatus status) {
|
| WebGeolocationPermissionRequest permissionRequest;
|
| if (!pending_permissions_->remove(permission_request_id, permissionRequest))
|
| return;
|
|
|
| - permissionRequest.setIsAllowed(status == PermissionStatus::GRANTED);
|
| + permissionRequest.setIsAllowed(status == mojom::PermissionStatus::GRANTED);
|
| }
|
|
|
| void GeolocationDispatcher::QueryNextPosition() {
|
|
|