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

Unified Diff: chrome/browser/content_settings/permission_queue_controller.h

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_queue_controller.h
diff --git a/chrome/browser/content_settings/permission_queue_controller.h b/chrome/browser/content_settings/permission_queue_controller.h
index ba2dbd424e0d3fff393c9d11ca2103b7f61eb50f..3e856b6a9875a8d896c62180f5894482822b0f61 100644
--- a/chrome/browser/content_settings/permission_queue_controller.h
+++ b/chrome/browser/content_settings/permission_queue_controller.h
@@ -6,6 +6,7 @@
#define CHROME_BROWSER_CONTENT_SETTINGS_PERMISSION_QUEUE_CONTROLLER_H_
#include "base/bind.h"
+#include "components/content_settings/core/common/content_settings.h"
#include "components/content_settings/core/common/content_settings_types.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
@@ -25,7 +26,7 @@ class Profile;
// the notification infrastructure would simplify.
class PermissionQueueController : public content::NotificationObserver {
public:
- typedef base::Callback<void(bool /* allowed */)> PermissionDecidedCallback;
+ using PermissionDecidedCallback = base::Callback<void(ContentSetting)>;
PermissionQueueController(Profile* profile, ContentSettingsType type);
~PermissionQueueController() override;
@@ -35,7 +36,7 @@ class PermissionQueueController : public content::NotificationObserver {
void CreateInfoBarRequest(const PermissionRequestID& id,
const GURL& requesting_frame,
const GURL& embedder,
- PermissionDecidedCallback callback);
+ const PermissionDecidedCallback& callback);
// Cancels a specific infobar request.
void CancelInfoBarRequest(const PermissionRequestID& id);

Powered by Google App Engine
This is Rietveld 408576698