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

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

Issue 1686903002: [Abandoned] Rename PermissionBubbleManager to PermissionRequestManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tests compile 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 74691a47252c1499c26da3613e256769238fe092..45c1a00b6775f21d6fec680a524194ae47bb8e7c 100644
--- a/chrome/browser/permissions/permission_context_base.cc
+++ b/chrome/browser/permissions/permission_context_base.cc
@@ -29,7 +29,7 @@
#include "chrome/browser/permissions/permission_queue_controller.h"
#else
#include "chrome/browser/permissions/permission_bubble_request_impl.h"
-#include "chrome/browser/ui/website_settings/permission_bubble_manager.h"
+#include "chrome/browser/permissions/permission_request_manager.h"
#endif
// static
@@ -152,8 +152,8 @@ void PermissionContextBase::CancelPermissionRequest(
#else
PermissionBubbleRequest* cancelling = pending_bubbles_.get(id.ToString());
if (cancelling != NULL && web_contents != NULL &&
- PermissionBubbleManager::FromWebContents(web_contents) != NULL) {
- PermissionBubbleManager::FromWebContents(web_contents)
+ PermissionRequestManager::FromWebContents(web_contents) != NULL) {
+ PermissionRequestManager::FromWebContents(web_contents)
->CancelRequest(cancelling);
}
#endif
@@ -168,11 +168,11 @@ void PermissionContextBase::DecidePermission(
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
#if !defined(OS_ANDROID)
- PermissionBubbleManager* bubble_manager =
- PermissionBubbleManager::FromWebContents(web_contents);
- // TODO(felt): sometimes |bubble_manager| is null. This check is meant to
- // prevent crashes. See crbug.com/457091.
- if (!bubble_manager)
+ PermissionRequestManager* permission_request_manager =
+ PermissionRequestManager::FromWebContents(web_contents);
+ // TODO(felt): sometimes |permission_request_manager| is null. This check is
+ // meant to prevent crashes. See crbug.com/457091.
+ if (!permission_request_manager)
return;
std::unique_ptr<PermissionBubbleRequest> request_ptr(
new PermissionBubbleRequestImpl(
@@ -187,7 +187,7 @@ void PermissionContextBase::DecidePermission(
bool inserted =
pending_bubbles_.add(id.ToString(), std::move(request_ptr)).second;
DCHECK(inserted) << "Duplicate id " << id.ToString();
- bubble_manager->AddRequest(request);
+ permission_request_manager->AddRequest(request);
#else
GetQueueController()->CreateInfoBarRequest(
id, requesting_origin, embedding_origin,

Powered by Google App Engine
This is Rietveld 408576698