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

Unified Diff: chrome/browser/content_settings/permission_context_base.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_context_base.h
diff --git a/chrome/browser/content_settings/permission_context_base.h b/chrome/browser/content_settings/permission_context_base.h
index 740aa8f437817bf43f97573ef80f43e3810b0036..e727ce9cf482272e6d133c2ca9f78351b77fd257 100644
--- a/chrome/browser/content_settings/permission_context_base.h
+++ b/chrome/browser/content_settings/permission_context_base.h
@@ -23,7 +23,7 @@ namespace content {
class WebContents;
}
-typedef base::Callback<void(bool)> BrowserPermissionCallback;
+using BrowserPermissionCallback = base::Callback<void(ContentSetting)>;
// This base class contains common operations for granting permissions.
// It offers the following functionality:
@@ -95,14 +95,14 @@ class PermissionContextBase : public KeyedService {
const GURL& embedding_origin,
const BrowserPermissionCallback& callback,
bool persist,
- bool allowed);
+ ContentSetting content_setting);
virtual void NotifyPermissionSet(const PermissionRequestID& id,
const GURL& requesting_origin,
const GURL& embedding_origin,
const BrowserPermissionCallback& callback,
bool persist,
- bool allowed);
+ ContentSetting content_setting);
// Implementors can override this method to update the icons on the
// url bar with the result of the new permission.
@@ -121,7 +121,7 @@ class PermissionContextBase : public KeyedService {
// (for example for desktop notifications).
virtual void UpdateContentSetting(const GURL& requesting_origin,
const GURL& embedding_origin,
- bool allowed);
+ ContentSetting content_setting);
private:
// Called when a bubble is no longer used so it can be cleaned up.

Powered by Google App Engine
This is Rietveld 408576698