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

Unified Diff: chrome/browser/content_settings/permission_bubble_request_impl.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_bubble_request_impl.h
diff --git a/chrome/browser/content_settings/permission_bubble_request_impl.h b/chrome/browser/content_settings/permission_bubble_request_impl.h
index caf05b7cc92b1d3713f83a424c7308dc6a8783e4..985c9d0161b1590ed77ed33a07c9fd8bac5d4af6 100644
--- a/chrome/browser/content_settings/permission_bubble_request_impl.h
+++ b/chrome/browser/content_settings/permission_bubble_request_impl.h
@@ -7,6 +7,7 @@
#include "base/callback.h"
#include "chrome/browser/ui/website_settings/permission_bubble_request.h"
+#include "components/content_settings/core/common/content_settings.h"
#include "components/content_settings/core/common/content_settings_types.h"
#include "components/content_settings/core/common/permission_request_id.h"
@@ -19,16 +20,14 @@ class PermissionContextBase;
// is executed.
class PermissionBubbleRequestImpl : public PermissionBubbleRequest {
public:
-
- typedef base::Callback<void(bool persist_permission, bool grant_permission)>
- PermissionDecidedCallback;
+ using PermissionDecidedCallback = base::Callback<void(bool, ContentSetting)>;
PermissionBubbleRequestImpl(
const GURL& request_origin,
bool user_gesture,
ContentSettingsType type,
const std::string& display_languages,
- const PermissionDecidedCallback permission_decided_callback,
+ const PermissionDecidedCallback& permission_decided_callback,
const base::Closure delete_callback);
~PermissionBubbleRequestImpl() override;

Powered by Google App Engine
This is Rietveld 408576698