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

Unified Diff: chrome/browser/permissions/permission_manager.h

Issue 1316863010: browser: implement multiple permission requesting (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@request-multiple-content
Patch Set: Cut down on CL size Created 5 years, 3 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/permissions/permission_manager.h
diff --git a/chrome/browser/permissions/permission_manager.h b/chrome/browser/permissions/permission_manager.h
index a891dd8e0ebe6a00317aecbc7ac96c83a1de533b..db1d81be579a31a73fcc03deba270c31c3056c44 100644
--- a/chrome/browser/permissions/permission_manager.h
+++ b/chrome/browser/permissions/permission_manager.h
@@ -35,9 +35,17 @@ class PermissionManager : public KeyedService,
content::RenderFrameHost* render_frame_host,
const GURL& requesting_origin,
bool user_gesture,
- const base::Callback<void(content::PermissionStatus)>& callback) override;
+ const base::Callback<void(
+ content::PermissionStatus)>& callback) override;
+ int RequestPermissions(
+ const std::vector<content::PermissionType>& permissions,
+ content::RenderFrameHost* render_frame_host,
+ const GURL& requesting_origin,
+ bool user_gesture,
+ const base::Callback<void(
+ const std::vector<content::PermissionStatus>&)>& callback) override;
void CancelPermissionRequest(content::RenderFrameHost* render_frame_host,
- int request_id) override;
+ int request_id) override;
void ResetPermission(content::PermissionType permission,
const GURL& requesting_origin,
const GURL& embedding_origin) override;
@@ -62,11 +70,24 @@ class PermissionManager : public KeyedService,
struct Subscription;
using SubscriptionsMap = IDMap<Subscription, IDMapOwnPointer>;
+ int RequestPermissionsInternal(
+ const std::vector<content::PermissionType>& permissions,
+ content::RenderFrameHost* render_frame_host,
+ const GURL& requesting_origin,
+ bool user_gesture,
+ const base::Callback<void(
+ const std::vector<content::PermissionStatus>&)>& callback);
+
void OnPermissionRequestResponse(
int request_id,
- const base::Callback<void(content::PermissionStatus)>& callback,
+ int request_index,
ContentSetting content_setting);
+ void OnPermissionRequestResponseInternal(
+ int request_id,
+ int request_index,
+ content::PermissionStatus status);
+
// Not all WebContents are able to display permission requests. If the PBM
// is required but missing for |web_contents|, don't pass along the request.
bool IsPermissionBubbleManagerMissing(content::WebContents* web_contents);
« no previous file with comments | « no previous file | chrome/browser/permissions/permission_manager.cc » ('j') | content/browser/permissions/permission_service_impl.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698