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

Unified Diff: content/browser/permissions/permission_service_impl.cc

Issue 955383003: ContentBrowserClient::RequestPermission replies with PermissionStatus instead of bool. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix android geolocation breakage Created 5 years, 10 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
Index: content/browser/permissions/permission_service_impl.cc
diff --git a/content/browser/permissions/permission_service_impl.cc b/content/browser/permissions/permission_service_impl.cc
index bd5c87b8223a79c02c8a71a71adc42e7e8945733..a086c79ea1a15b8d36c2544e2a1756280b99ec8a 100644
--- a/content/browser/permissions/permission_service_impl.cc
+++ b/content/browser/permissions/permission_service_impl.cc
@@ -85,12 +85,14 @@ void PermissionServiceImpl::RequestPermission(
void PermissionServiceImpl::OnRequestPermissionResponse(
const mojo::Callback<void(PermissionStatus)>& callback,
int request_id,
- bool allowed) {
+ PermissionStatus status) {
pending_requests_.Remove(request_id);
- // TODO(mlamouri): for now, we only get a boolean back, but we would ideally
- // need a ContentSetting, see http://crbug.com/432978
- callback.Run(allowed ? PERMISSION_STATUS_GRANTED : PERMISSION_STATUS_ASK);
+ // TODO(mlamouri): this is not yet returning a tri-state value because it will
+ // require some further changes that will be dealt with in
+ // https://crrev.com/794203004/
+ status = status == PERMISSION_STATUS_DENIED ? PERMISSION_STATUS_ASK : status;
+ callback.Run(status);
}
void PermissionServiceImpl::CancelPendingRequests() {

Powered by Google App Engine
This is Rietveld 408576698