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

Unified Diff: chrome/browser/notifications/desktop_notification_service.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/notifications/desktop_notification_service.cc
diff --git a/chrome/browser/notifications/desktop_notification_service.cc b/chrome/browser/notifications/desktop_notification_service.cc
index 19b3b16782c555093462bdde1c1b5129ebb425b3..7c91e9d47f55fca425c84794760a65c727683a6a 100644
--- a/chrome/browser/notifications/desktop_notification_service.cc
+++ b/chrome/browser/notifications/desktop_notification_service.cc
@@ -96,7 +96,7 @@ void DesktopNotificationService::RequestNotificationPermission(
const PermissionRequestID& request_id,
const GURL& requesting_origin,
bool user_gesture,
- const base::Callback<void(bool)>& result_callback) {
+ const BrowserPermissionCallback& result_callback) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
#if defined(ENABLE_EXTENSIONS)
@@ -123,7 +123,7 @@ void DesktopNotificationService::RequestNotificationPermission(
extensions::APIPermission::kNotifications,
extension,
web_contents->GetRenderViewHost())) {
- result_callback.Run(true);
+ result_callback.Run(CONTENT_SETTING_ALLOW);
return;
}
#endif
@@ -245,8 +245,11 @@ void DesktopNotificationService::OnExtensionUninstalled(
void DesktopNotificationService::UpdateContentSetting(
const GURL& requesting_origin,
const GURL& embedder_origin,
- bool allowed) {
- if (allowed) {
+ ContentSetting content_setting) {
+ DCHECK(content_setting == CONTENT_SETTING_ALLOW ||
+ content_setting == CONTENT_SETTING_BLOCK);
+
+ if (content_setting == CONTENT_SETTING_ALLOW) {
DesktopNotificationProfileUtil::GrantPermission(
profile_, requesting_origin);
} else {

Powered by Google App Engine
This is Rietveld 408576698