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

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

Issue 2123653006: Rename PermissionBubbleRequest to PermissionRequest (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@permission_manager_rename
Patch Set: Fix missed file Created 4 years, 5 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_request_manager.h
diff --git a/chrome/browser/permissions/permission_request_manager.h b/chrome/browser/permissions/permission_request_manager.h
index 78b626c55d4e1f29cdbe01f6e0e4b91d6c82b148..de5655e861f0edbe3df088ce58714b12b1523394 100644
--- a/chrome/browser/permissions/permission_request_manager.h
+++ b/chrome/browser/permissions/permission_request_manager.h
@@ -15,7 +15,7 @@
#include "content/public/browser/web_contents_observer.h"
#include "content/public/browser/web_contents_user_data.h"
-class PermissionBubbleRequest;
+class PermissionRequest;
// Provides access to permissions bubbles. Allows clients to add a request
// callback interface to the existing permission bubble configuration.
@@ -55,7 +55,7 @@ class PermissionRequestManager
// bubble closes. A request with message text identical to an outstanding
// request will be merged with the outstanding request, and will have the same
// callbacks called as the outstanding request.
- void AddRequest(PermissionBubbleRequest* request);
+ void AddRequest(PermissionRequest* request);
// Cancels an outstanding request. This may have different effects depending
// on what is going on with the bubble. If the request is pending, it will be
@@ -64,7 +64,7 @@ class PermissionRequestManager
// In some circumstances, we can remove the request from the bubble, and may
// do so. The request will have RequestFinished executed on it if it is found,
// at which time the caller is free to delete the request.
- void CancelRequest(PermissionBubbleRequest* request);
+ void CancelRequest(PermissionRequest* request);
// Hides the bubble.
void HideBubble();
@@ -143,21 +143,20 @@ class PermissionRequestManager
// *not* |duplicate_requests_| - for a request matching |request|, and returns
// the matching request, or |nullptr| if no match. Note that the matching
// request may or may not be the same object as |request|.
- PermissionBubbleRequest* GetExistingRequest(PermissionBubbleRequest* request);
+ PermissionRequest* GetExistingRequest(PermissionRequest* request);
// Returns true if |queue| contains a request which was generated by a user
// gesture. Returns false otherwise.
- bool HasUserGestureRequest(
- const std::vector<PermissionBubbleRequest*>& queue);
+ bool HasUserGestureRequest(const std::vector<PermissionRequest*>& queue);
// Calls PermissionGranted on a request and all its duplicates.
- void PermissionGrantedIncludingDuplicates(PermissionBubbleRequest* request);
+ void PermissionGrantedIncludingDuplicates(PermissionRequest* request);
// Calls PermissionDenied on a request and all its duplicates.
- void PermissionDeniedIncludingDuplicates(PermissionBubbleRequest* request);
+ void PermissionDeniedIncludingDuplicates(PermissionRequest* request);
// Calls Cancelled on a request and all its duplicates.
- void CancelledIncludingDuplicates(PermissionBubbleRequest* request);
+ void CancelledIncludingDuplicates(PermissionRequest* request);
// Calls RequestFinished on a request and all its duplicates.
- void RequestFinishedIncludingDuplicates(PermissionBubbleRequest* request);
+ void RequestFinishedIncludingDuplicates(PermissionRequest* request);
void NotifyBubbleAdded();
@@ -169,12 +168,12 @@ class PermissionRequestManager
// The UI surface to be used to display the permissions requests.
std::unique_ptr<PermissionBubbleView> view_;
- std::vector<PermissionBubbleRequest*> requests_;
- std::vector<PermissionBubbleRequest*> queued_requests_;
- std::vector<PermissionBubbleRequest*> queued_frame_requests_;
+ std::vector<PermissionRequest*> requests_;
+ std::vector<PermissionRequest*> queued_requests_;
+ std::vector<PermissionRequest*> queued_frame_requests_;
// Maps from the first request of a kind to subsequent requests that were
// duped against it.
- std::unordered_multimap<PermissionBubbleRequest*, PermissionBubbleRequest*>
+ std::unordered_multimap<PermissionRequest*, PermissionRequest*>
duplicate_requests_;
// URL of the main frame in the WebContents to which this manager is attached.
« no previous file with comments | « chrome/browser/permissions/permission_request_impl.cc ('k') | chrome/browser/permissions/permission_request_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698