permissions: remove PermissionQueueController and introduce PermissionInfoBarManager

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 "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/permissions/permission_bubble_request_impl.h"
 #include "chrome/browser/permissions/permission_context_uma_util.h"
-#include "chrome/browser/permissions/permission_queue_controller.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/ui/website_settings/permission_bubble_manager.h"
 #include "chrome/common/pref_names.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/browser/website_settings_registry.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/origin_util.h"
 
 PermissionContextBase::PermissionContextBase(
     Profile* profile,
     const ContentSettingsType permission_type)
     : profile_(profile),
       permission_type_(permission_type),
       weak_factory_(this) {
-  permission_queue_controller_.reset(
-      new PermissionQueueController(profile_, permission_type_));
 }
 
 PermissionContextBase::~PermissionContextBase() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 }
 
 void PermissionContextBase::RequestPermission(
     content::WebContents* web_contents,
     const PermissionRequestID& id,
     const GURL& requesting_frame,
@@ skipping 31 matching lines @@
       ContentSettingsPattern::FromURLNoWildcard(requesting_origin),
       ContentSettingsPattern::FromURLNoWildcard(embedding_origin),
       permission_type_, std::string(), CONTENT_SETTING_DEFAULT);
 }
 
 void PermissionContextBase::CancelPermissionRequest(
     content::WebContents* web_contents,
     const PermissionRequestID& id) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
+  if (!web_contents)
+    return;
+
   if (PermissionBubbleManager::Enabled()) {
     PermissionBubbleRequest* cancelling =
         pending_bubbles_.get(id.ToString());
-    if (cancelling != NULL && web_contents != NULL &&
+    if (cancelling != NULL &&
         PermissionBubbleManager::FromWebContents(web_contents) != NULL) {
       PermissionBubbleManager::FromWebContents(web_contents)->
           CancelRequest(cancelling);
     }
     return;
   }
 
-  GetQueueController()->CancelInfoBarRequest(id);
+  if (PermissionInfoBarManager::FromWebContents(web_contents) != NULL) {

[mlamouri (slow - plz ping), 2015/09/28 13:30:14]

Remove |!= NULL| and do !PermissionInfoBarManager::...

[Lalit Maganti, 2015/09/28 15:32:38]

Done.

+    PermissionInfoBarManager::FromWebContents(web_contents)->
+        CancelInfoBarRequest(id);
+  }

[mlamouri (slow - plz ping), 2015/09/28 13:30:14]

What about removing the |return;| from the |PermissionBubbleManager::Enabled|
block and have a |else if| instead? The |return;| in the first block but not the
second sounds slightly error prone.

[Lalit Maganti, 2015/09/28 15:32:38]

Done.

 }
 
 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);
@@ skipping 51 matching lines @@
                        weak_factory_.GetWeakPtr(), id)));
     PermissionBubbleRequest* request = request_ptr.get();
 
     bool inserted = pending_bubbles_.add(
         id.ToString(), request_ptr.Pass()).second;
     DCHECK(inserted) << "Duplicate id " << id.ToString();
     bubble_manager->AddRequest(request);
     return;
   }
 
-  // TODO(gbillock): Delete this and the infobar delegate when
-  // we're using only bubbles. crbug.com/337458
-  GetQueueController()->CreateInfoBarRequest(
-      id, requesting_origin, embedding_origin,
+  PermissionInfoBarManager* infobar_manager =
+      PermissionInfoBarManager::FromWebContents(web_contents);
+  DCHECK(infobar_manager);

[mlamouri (slow - plz ping), 2015/09/28 13:30:14]

What if we are not in a Tab context? Couldn't the WebContents have no
PermissionInfoBarManager?

[Lalit Maganti, 2015/09/28 15:32:38]

You're right this is an issue. Best course of action is to handle this in
permission manager and change IsPermissionBubbleManagerMissing ->
IsPermissionUIManagerMissing.

+  infobar_manager->CreateInfoBarRequest(
+      permission_type_, 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));
+                 embedding_origin, callback),
+      base::Bind(&PermissionContextBase::NotifyPermissionSet,

[mlamouri (slow - plz ping), 2015/09/28 13:30:14]

It would be great to unify that with what Bubble does. Also,
::NotifyPermissionSet is a hack given what you are trying to do. We should have
a callback that simply run the callback with the current permission status.

[Lalit Maganti, 2015/09/28 15:32:38]

Changed as discussed.

+                 weak_factory_.GetWeakPtr(), id, requesting_origin,
+                 embedding_origin, callback));
 }
 
 void PermissionContextBase::PermissionDecided(
     const PermissionRequestID& id,
     const GURL& requesting_origin,
     const GURL& embedding_origin,
     const BrowserPermissionCallback& callback,
     bool persist,
     ContentSetting content_setting) {
-  // Infobar persistance and its related UMA is tracked on the infobar
-  // controller directly.
-  if (PermissionBubbleManager::Enabled()) {
-    if (persist) {
-      DCHECK(content_setting == CONTENT_SETTING_ALLOW ||
-             content_setting == CONTENT_SETTING_BLOCK);
-      if (content_setting == CONTENT_SETTING_ALLOW)
-        PermissionContextUmaUtil::PermissionGranted(permission_type_,
-                                                    requesting_origin);
-      else
-        PermissionContextUmaUtil::PermissionDenied(permission_type_,
-                                                   requesting_origin);
-    } else {
-      DCHECK_EQ(content_setting, CONTENT_SETTING_DEFAULT);
-      PermissionContextUmaUtil::PermissionDismissed(permission_type_,
-                                                    requesting_origin);
-    }
+  if (persist) {
+    DCHECK(content_setting == CONTENT_SETTING_ALLOW ||
+           content_setting == CONTENT_SETTING_BLOCK);
+    if (content_setting == CONTENT_SETTING_ALLOW)
+      PermissionContextUmaUtil::PermissionGranted(permission_type_,
+                                                  requesting_origin);
+    else
+      PermissionContextUmaUtil::PermissionDenied(permission_type_,
+                                                 requesting_origin);
+  } else {
+    DCHECK_EQ(content_setting, CONTENT_SETTING_DEFAULT);
+    PermissionContextUmaUtil::PermissionDismissed(permission_type_,
+                                                  requesting_origin);
   }
 
   NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
                       persist, content_setting);
 }
 
-PermissionQueueController* PermissionContextBase::GetQueueController() {
-  return permission_queue_controller_.get();
-}
-
 Profile* PermissionContextBase::profile() const {
   return profile_;
 }
 
 void PermissionContextBase::NotifyPermissionSet(
     const PermissionRequestID& id,
     const GURL& requesting_origin,
     const GURL& embedding_origin,
     const BrowserPermissionCallback& callback,
     bool persist,
@@ skipping 28 matching lines @@
   DCHECK_EQ(requesting_origin, requesting_origin.GetOrigin());
   DCHECK_EQ(embedding_origin, embedding_origin.GetOrigin());
   DCHECK(content_setting == CONTENT_SETTING_ALLOW ||
          content_setting == CONTENT_SETTING_BLOCK);
 
   HostContentSettingsMapFactory::GetForProfile(profile_)->SetContentSetting(
       ContentSettingsPattern::FromURLNoWildcard(requesting_origin),
       ContentSettingsPattern::FromURLNoWildcard(embedding_origin),
       permission_type_, std::string(), content_setting);
 }