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

Unified Diff: chrome/browser/permissions/permission_context_base.cc

Issue 1689513002: [Abandoned] rename PermissionBubbleRequest to PermissionRequest. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@permission-request-manager-rename
Patch Set: browser_tests compiles Created 4 years, 8 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_context_base.cc
diff --git a/chrome/browser/permissions/permission_context_base.cc b/chrome/browser/permissions/permission_context_base.cc
index 45c1a00b6775f21d6fec680a524194ae47bb8e7c..a954190af0ea457baa002ec24bd40349daa44b1f 100644
--- a/chrome/browser/permissions/permission_context_base.cc
+++ b/chrome/browser/permissions/permission_context_base.cc
@@ -28,7 +28,7 @@
#if defined(OS_ANDROID)
#include "chrome/browser/permissions/permission_queue_controller.h"
#else
-#include "chrome/browser/permissions/permission_bubble_request_impl.h"
+#include "chrome/browser/permissions/permission_request_impl.h"
#include "chrome/browser/permissions/permission_request_manager.h"
#endif
@@ -150,7 +150,7 @@ void PermissionContextBase::CancelPermissionRequest(
#if defined(OS_ANDROID)
GetQueueController()->CancelInfoBarRequest(id);
#else
- PermissionBubbleRequest* cancelling = pending_bubbles_.get(id.ToString());
+ PermissionRequest* cancelling = pending_requests_.get(id.ToString());
if (cancelling != NULL && web_contents != NULL &&
PermissionRequestManager::FromWebContents(web_contents) != NULL) {
PermissionRequestManager::FromWebContents(web_contents)
@@ -174,18 +174,17 @@ void PermissionContextBase::DecidePermission(
// meant to prevent crashes. See crbug.com/457091.
if (!permission_request_manager)
return;
- std::unique_ptr<PermissionBubbleRequest> request_ptr(
- new PermissionBubbleRequestImpl(
+ std::unique_ptr<PermissionRequest> request_ptr(new PermissionRequestImpl(
requesting_origin, permission_type_,
base::Bind(&PermissionContextBase::PermissionDecided,
weak_factory_.GetWeakPtr(), id, requesting_origin,
embedding_origin, callback),
- base::Bind(&PermissionContextBase::CleanUpBubble,
+ base::Bind(&PermissionContextBase::CleanUpRequest,
weak_factory_.GetWeakPtr(), id)));
- PermissionBubbleRequest* request = request_ptr.get();
+ PermissionRequest* request = request_ptr.get();
bool inserted =
- pending_bubbles_.add(id.ToString(), std::move(request_ptr)).second;
+ pending_requests_.add(id.ToString(), std::move(request_ptr)).second;
DCHECK(inserted) << "Duplicate id " << id.ToString();
permission_request_manager->AddRequest(request);
#else
@@ -262,8 +261,8 @@ void PermissionContextBase::NotifyPermissionSet(
callback.Run(content_setting);
}
-void PermissionContextBase::CleanUpBubble(const PermissionRequestID& id) {
- size_t success = pending_bubbles_.erase(id.ToString());
+void PermissionContextBase::CleanUpRequest(const PermissionRequestID& id) {
+ size_t success = pending_requests_.erase(id.ToString());
DCHECK(success == 1) << "Missing request " << id.ToString();
}
« no previous file with comments | « chrome/browser/permissions/permission_context_base.h ('k') | chrome/browser/permissions/permission_request.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698