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

Unified Diff: chrome/browser/content_settings/permission_bubble_request_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: chrome/browser/content_settings/permission_bubble_request_impl.cc
diff --git a/chrome/browser/content_settings/permission_bubble_request_impl.cc b/chrome/browser/content_settings/permission_bubble_request_impl.cc
index 5d7e6be70fbe2659a7d3ce04abf6043dde711852..3fc8bedca41c410a8afc0408c152e50cad27a36b 100644
--- a/chrome/browser/content_settings/permission_bubble_request_impl.cc
+++ b/chrome/browser/content_settings/permission_bubble_request_impl.cc
@@ -16,7 +16,7 @@ PermissionBubbleRequestImpl::PermissionBubbleRequestImpl(
bool user_gesture,
ContentSettingsType type,
const std::string& display_languages,
- const base::Callback<void(bool, bool)> permission_decided_callback,
+ const PermissionDecidedCallback& permission_decided_callback,
const base::Closure delete_callback)
: request_origin_(request_origin),
user_gesture_(user_gesture),
@@ -136,17 +136,17 @@ GURL PermissionBubbleRequestImpl::GetRequestingHostname() const {
void PermissionBubbleRequestImpl::PermissionGranted() {
RegisterActionTaken();
- permission_decided_callback_.Run(true, true);
+ permission_decided_callback_.Run(true, CONTENT_SETTING_ALLOW);
}
void PermissionBubbleRequestImpl::PermissionDenied() {
RegisterActionTaken();
- permission_decided_callback_.Run(true, false);
+ permission_decided_callback_.Run(true, CONTENT_SETTING_BLOCK);
}
void PermissionBubbleRequestImpl::Cancelled() {
RegisterActionTaken();
- permission_decided_callback_.Run(false, false);
+ permission_decided_callback_.Run(false, CONTENT_SETTING_DEFAULT);
}
void PermissionBubbleRequestImpl::RequestFinished() {

Powered by Google App Engine
This is Rietveld 408576698