permissions: remove PermissionQueueController and introduce PermissionInfoBarManager

chrome/browser/permissions/permission_manager.cc

 // Copyright 2015 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_manager.h"
 
 #include "base/callback.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/permissions/permission_context.h"
 #include "chrome/browser/permissions/permission_context_base.h"
+#include "chrome/browser/permissions/permission_infobar_manager.h"
 #include "chrome/browser/permissions/permission_request_id.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "content/public/browser/permission_type.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 
 #if !defined(OS_ANDROID)
@@ skipping 214 matching lines @@
   PendingRequest* pending_request = new PendingRequest(
       render_frame_host, permissions, callback);
   int request_id = pending_requests_.Add(pending_request);
 
   const PermissionRequestID request(render_frame_host, request_id);
 
   for (size_t i = 0; i < permissions.size(); ++i) {
     const PermissionType permission = permissions[i];
 
     if (IsConstantPermission(permission) ||
-        IsPermissionBubbleManagerMissing(web_contents) ||
+        IsPermissionUIManagerMissing(web_contents) ||
         !PermissionContext::Get(profile_, permission)) {
       OnPermissionsRequestResponseStatus(request_id, i,
           GetPermissionStatus(permission, requesting_origin, embedding_origin));
       continue;
     }
 
     PermissionContextBase* context = PermissionContext::Get(
         profile_, permission);
     context->RequestPermission(
         web_contents, request, requesting_origin, user_gesture,
@@ skipping 24 matching lines @@
 }
 
 void PermissionManager::CancelPermissionRequest(int request_id) {
   PendingRequest* pending_request = pending_requests_.Lookup(request_id);
   if (!pending_request)
     return;
 
   content::WebContents* web_contents = tab_util::GetWebContentsByFrameID(
       pending_request->render_process_id(), pending_request->render_frame_id());
   DCHECK(web_contents);
-  if (IsPermissionBubbleManagerMissing(web_contents)) {
+  if (IsPermissionUIManagerMissing(web_contents)) {
     pending_requests_.Remove(request_id);
     return;
   }
 
   const PermissionRequestID request(pending_request->render_process_id(),
                                     pending_request->render_frame_id(),
                                     request_id);
   for (PermissionType permission : pending_request->permissions()) {
     PermissionContextBase* context = PermissionContext::Get(
         profile_, permission);
@@ skipping 72 matching lines @@
 
 void PermissionManager::UnsubscribePermissionStatusChange(int subscription_id) {
   // Whether |subscription_id| is known will be checked by the Remove() call.
   subscriptions_.Remove(subscription_id);
 
   if (subscriptions_.IsEmpty())
     HostContentSettingsMapFactory::GetForProfile(profile_)
         ->RemoveObserver(this);
 }
 
-bool PermissionManager::IsPermissionBubbleManagerMissing(
+bool PermissionManager::IsPermissionUIManagerMissing(
     content::WebContents* web_contents) {
   // TODO(felt): Remove this method entirely. Leaving it to make a minimal
   // last-minute merge to 46. See crbug.com/457091 and crbug.com/534631.
   return false;
 }
 
 void PermissionManager::OnContentSettingChanged(
     const ContentSettingsPattern& primary_pattern,
     const ContentSettingsPattern& secondary_pattern,
     ContentSettingsType content_type,
@@ skipping 27 matching lines @@
     // Add the callback to |callbacks| which will be run after the loop to
     // prevent re-entrance issues.
     callbacks.push_back(
         base::Bind(subscription->callback,
                    ContentSettingToPermissionStatus(new_value)));
   }
 
   for (const auto& callback : callbacks)
     callback.Run();
 }