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

Unified Diff: content/renderer/geolocation_dispatcher.cc

Issue 1943963004: Revert of (reland) Move permission.mojom from WebKit/public/platform/ to components/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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
« no previous file with comments | « content/renderer/geolocation_dispatcher.h ('k') | content/renderer/media/media_permission_dispatcher.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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() {
« no previous file with comments | « content/renderer/geolocation_dispatcher.h ('k') | content/renderer/media/media_permission_dispatcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698