Index: content/renderer/geolocation_dispatcher.cc |
diff --git a/content/renderer/geolocation_dispatcher.cc b/content/renderer/geolocation_dispatcher.cc |
index 663f82d5775c6395cccc702c3016e1072c445fa8..083927fce88076ec67d93fd29af75dfc7f10a4e1 100644 |
--- a/content/renderer/geolocation_dispatcher.cc |
+++ b/content/renderer/geolocation_dispatcher.cc |
@@ -7,11 +7,11 @@ |
#include "content/public/common/geoposition.h" |
#include "content/renderer/render_view_impl.h" |
#include "third_party/WebKit/public/platform/WebString.h" |
-#include "third_party/WebKit/public/web/WebGeolocationClient.h" |
-#include "third_party/WebKit/public/web/WebGeolocationError.h" |
#include "third_party/WebKit/public/web/WebGeolocationPermissionRequest.h" |
#include "third_party/WebKit/public/web/WebGeolocationPermissionRequestManager.h" |
+#include "third_party/WebKit/public/web/WebGeolocationClient.h" |
#include "third_party/WebKit/public/web/WebGeolocationPosition.h" |
+#include "third_party/WebKit/public/web/WebGeolocationError.h" |
using blink::WebGeolocationController; |
using blink::WebGeolocationError; |
@@ -80,7 +80,7 @@ |
int permission_request_id = pending_permissions_->add(permissionRequest); |
permission_service_->RequestPermission( |
- permissions::mojom::PermissionName::GEOLOCATION, |
+ blink::mojom::PermissionName::GEOLOCATION, |
permissionRequest.getSecurityOrigin().toString().utf8(), |
base::Bind(&GeolocationDispatcher::OnPermissionSet, |
base::Unretained(this), permission_request_id)); |
@@ -95,13 +95,13 @@ |
// Permission for using geolocation has been set. |
void GeolocationDispatcher::OnPermissionSet( |
int permission_request_id, |
- permissions::mojom::PermissionStatus status) { |
+ blink::mojom::PermissionStatus status) { |
WebGeolocationPermissionRequest permissionRequest; |
if (!pending_permissions_->remove(permission_request_id, permissionRequest)) |
return; |
permissionRequest.setIsAllowed(status == |
- permissions::mojom::PermissionStatus::GRANTED); |
+ blink::mojom::PermissionStatus::GRANTED); |
} |
void GeolocationDispatcher::QueryNextPosition() { |