permissions: remove PermissionQueueController and introduce PermissionInfoBarManager

chrome/browser/permissions/permission_infobar_manager.h

+// 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.
+
+#ifndef CHROME_BROWSER_PERMISSIONS_PERMISSION_INFOBAR_MANAGER_H_
+#define CHROME_BROWSER_PERMISSIONS_PERMISSION_INFOBAR_MANAGER_H_
+
+#include "base/callback_forward.h"
+#include "base/containers/scoped_ptr_hash_map.h"
+#include "base/memory/weak_ptr.h"
+#include "chrome/browser/permissions/permission_request_id.h"
+#include "components/content_settings/core/common/content_settings.h"
+#include "components/content_settings/core/common/content_settings_types.h"
+#include "content/public/browser/web_contents_observer.h"
+#include "content/public/browser/web_contents_user_data.h"
+
+class GURL;
+class PermissionInfoBarRequest;
+
+// Manages permsision requests using InfoBars. Requests are coalesced by
+// request_id. If multiple requests occur with overlapping permissions, both
+// will be shown and the last to have a response will be persisted.
+class PermissionInfoBarManager
+    : public content::WebContentsObserver,
+      public content::WebContentsUserData<PermissionInfoBarManager> {
+ public:
+  ~PermissionInfoBarManager() override;
+
+  // Queues an infobar request to be shown at some point. Requests with
+  // the same |request_id| are coalesced.
+  void CreateRequest(
+      const ContentSettingsType type,
+      const PermissionRequestID& request,
+      const GURL& requesting_origin,
+      const GURL& embedding_origin,
+      const base::Callback<void(bool, ContentSetting)>& response_callback);
+
+  // Cancels a specific infobar request.
+  void CancelRequest(const PermissionRequestID& request);
+
+ private:
+  friend class GeolocationPermissionContextTests;
+  friend class PermissionContextBaseTests;
+  friend class content::WebContentsUserData<PermissionInfoBarManager>;
+  using PermissionDecidedCallback = base::Callback<void(bool, ContentSetting)>;
+
+  explicit PermissionInfoBarManager(content::WebContents* web_contents);
+
+  // Used by tests to accept or ignore the current request.
+  void Accept();
+  void Closing();

[mlamouri (slow - plz ping), 2015/10/02 11:49:39]

If these are for tests only, please add "ForTests". We have checks that make
sure we don't call these methods in production code.

[Lalit Maganti, 2015/10/02 13:37:45]

Done.

+
+  // Posts a call to |ShowNextQueuedRequest| if there is no current request
+  // and |queued_requests_| is not empty.
+  void TriggerShowNextQueuedRequest();
+
+  // Shows the next request in |queued_requests_| if there is no current
+  // request and if |queued_requests_| is not empty
+  void ShowNextQueuedRequest();
+
+  // Callback function used when the infobar is dismissed, accepted or denied.
+  void OnInfoBarClosed();
+
+  // Remoes the current request and shows a next queued request if available.

[mlamouri (slow - plz ping), 2015/10/02 11:49:39]

nit: typo

[Lalit Maganti, 2015/10/02 13:37:45]

Done.

+  void ClearCurrentRequest();
+
+  // Returns whether the queue should be ignored when considering to show
+  // a new request.
+  bool ShouldIgnoreQueuedRequests();
+
+  scoped_ptr<PermissionInfoBarRequest> current_request_;

[mlamouri (slow - plz ping), 2015/10/02 11:49:39]

nit: add comment

[Lalit Maganti, 2015/10/02 13:37:45]

Done.

+
+  bool is_show_pending_;

[mlamouri (slow - plz ping), 2015/10/02 11:49:39]

nit: add comment

[Lalit Maganti, 2015/10/02 13:37:45]

Done.

+
+  base::ScopedPtrHashMap<int,
+      scoped_ptr<PermissionInfoBarRequest>> queued_requests_;

[mlamouri (slow - plz ping), 2015/10/02 11:49:39]

What about using IDMap here instead? It would guarantee that |this| owns the
pointers instead of using a scoped_ptr.

nit: add comment (and point that the request from |current_request_| will not be
there)

[Lalit Maganti, 2015/10/02 13:37:45]

That would be good except I can't extract the pointer out of the map to store it
in current_request_. I've kept it as current for now.

Done.

+
+  base::WeakPtrFactory<PermissionInfoBarManager> weak_factory_;
+
+  DISALLOW_COPY_AND_ASSIGN(PermissionInfoBarManager);
+};
+
+#endif  // CHROME_BROWSER_PERMISSIONS_PERMISSION_INFOBAR_MANAGER_H_