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 "chrome/browser/ui/website_settings/permission_bubble_manager.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"
 
@@ skipping 138 matching lines @@
   }
 
   PermissionContextBase* context = PermissionContext::Get(profile_, permission);
   if (!context) {
     callback.Run(content::PERMISSION_STATUS_DENIED);
     return kNoPendingOperation;
   }
 
   content::WebContents* web_contents =
       content::WebContents::FromRenderFrameHost(render_frame_host);
-  if (IsPermissionBubbleManagerMissing(web_contents)) {
+  if (IsPermissionUIManagerMissing(web_contents)) {
     callback.Run(
         GetPermissionStatus(permission, requesting_origin,
                             web_contents->GetLastCommittedURL().GetOrigin()));
     return kNoPendingOperation;
   }
 
   PendingRequest* pending_request = new PendingRequest(
       permission, render_frame_host);
   int request_id = pending_requests_.Add(pending_request);
   const PermissionRequestID request(pending_request->render_process_id,
@@ skipping 23 matching lines @@
     return;
 
   PermissionContextBase* context = PermissionContext::Get(
       profile_, pending_request->permission);
   if (!context)
     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);
   context->CancelPermissionRequest(web_contents, request);
   pending_requests_.Remove(request_id);
 }
@@ skipping 66 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) {
-  // Can't be missing if it isn't needed to begin with.
-  if (!PermissionBubbleManager::Enabled())
-    return false;
+  if (PermissionBubbleManager::Enabled())
+    return PermissionBubbleManager::FromWebContents(web_contents) == nullptr;
 
-  return PermissionBubbleManager::FromWebContents(web_contents) == nullptr;
+  // Consider PermissionInfoBarManager's state instead
+  return PermissionInfoBarManager::FromWebContents(web_contents) == nullptr;
 }
 
 void PermissionManager::OnContentSettingChanged(
     const ContentSettingsPattern& primary_pattern,
     const ContentSettingsPattern& secondary_pattern,
     ContentSettingsType content_type,
     std::string resource_identifier) {
   std::list<base::Closure> callbacks;
 
   for (SubscriptionsMap::iterator iter(&subscriptions_);
@@ skipping 23 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();
 }