Rename PermissionBubbleManager to PermissionRequestManager

chrome/browser/permissions/permission_context_base.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/permissions/permission_context_base.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/logging.h"
@@ skipping 11 matching lines @@
 #include "components/variations/variations_associated_data.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/origin_util.h"
 
 #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/ui/website_settings/permission_bubble_manager.h"
+#include "chrome/browser/permissions/permission_request_manager.h"
 #endif
 
 // static
 const char PermissionContextBase::kPermissionsKillSwitchFieldStudy[] =
     "PermissionsKillSwitch";
 // static
 const char PermissionContextBase::kPermissionsKillSwitchBlockedValue[] =
     "blocked";
 
 PermissionContextBase::PermissionContextBase(
@@ skipping 103 matching lines @@
 void PermissionContextBase::CancelPermissionRequest(
     content::WebContents* web_contents,
     const PermissionRequestID& id) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
 #if defined(OS_ANDROID)
   GetQueueController()->CancelInfoBarRequest(id);
 #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
 }
 
 void PermissionContextBase::DecidePermission(
     content::WebContents* web_contents,
     const PermissionRequestID& id,
     const GURL& requesting_origin,
     const GURL& embedding_origin,
     bool user_gesture,
     const BrowserPermissionCallback& callback) {
   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(
           requesting_origin, permission_type_,
           base::Bind(&PermissionContextBase::PermissionDecided,
                      weak_factory_.GetWeakPtr(), id, requesting_origin,
                      embedding_origin, callback),
           base::Bind(&PermissionContextBase::CleanUpBubble,
                      weak_factory_.GetWeakPtr(), id)));
   PermissionBubbleRequest* request = request_ptr.get();
 
   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,
       base::Bind(&PermissionContextBase::PermissionDecided,
                  weak_factory_.GetWeakPtr(), id, requesting_origin,
                  embedding_origin, callback,
                  // the queue controller takes care of persisting the
                  // permission
                  false));
 #endif
@@ skipping 81 matching lines @@
                                       content_setting);
 }
 
 bool PermissionContextBase::IsPermissionKillSwitchOn() const {
   const std::string param = variations::GetVariationParamValue(
       kPermissionsKillSwitchFieldStudy,
       PermissionUtil::GetPermissionString(permission_type_));
 
   return param == kPermissionsKillSwitchBlockedValue;
 }