Move requests from GroupedPermissionInfoBarDelegate to PermissionPromptAndroid

chrome/browser/permissions/permission_prompt_android.h

Index: chrome/browser/permissions/permission_prompt_android.h
diff --git a/chrome/browser/permissions/permission_prompt_android.h b/chrome/browser/permissions/permission_prompt_android.h
index 9c052e24412c8f1770a34b594bbcc4855f31e28d..eaed551231a654eb1184578855675d37fe4b7c50 100644
--- a/chrome/browser/permissions/permission_prompt_android.h
+++ b/chrome/browser/permissions/permission_prompt_android.h
@@ -5,9 +5,13 @@
 #ifndef CHROME_BROWSER_PERMISSIONS_PERMISSION_PROMPT_ANDROID_H_
 #define CHROME_BROWSER_PERMISSIONS_PERMISSION_PROMPT_ANDROID_H_
 
+#include <vector>
+
+#include "base/strings/string16.h"
 #include "chrome/browser/ui/permission_bubble/permission_prompt.h"
+#include "components/content_settings/core/common/content_settings_types.h"
 
-class InfoBarService;
+class PermissionRequest;
 
 namespace content {
 class WebContents;
@@ -37,6 +41,11 @@ class PermissionPromptAndroid : public PermissionPrompt {
   void Accept();
   void Deny();
 
+  size_t PermissionCount() const { return requests_.size(); }

[benwells, 2017/03/20 03:10:43]

Nit: use unix_hacker_style for inline function name.

https://chromium.googlesource.com/chromium/src/+/master/styleguide/c++/c++.md...

[Timothy Loh, 2017/03/28 02:48:15]

Done.

+  ContentSettingsType GetContentSettingType(size_t position) const;
+  int GetIconIdForPermission(size_t position) const;
+  base::string16 GetMessageTextFragment(size_t position) const;
+
  private:
   // PermissionPromptAndroid is owned by PermissionRequestManager, so it should
   // be safe to hold a raw WebContents pointer here because this class is
@@ -47,6 +56,8 @@ class PermissionPromptAndroid : public PermissionPrompt {
   // |infobar_| is owned by the InfoBarService; we keep a pointer here so we can
   // ask the service to remove the infobar after it is added.
   infobars::InfoBar* infobar_;
+  // The current request being displayed (if any).
+  std::vector<PermissionRequest*> requests_;
 
   DISALLOW_COPY_AND_ASSIGN(PermissionPromptAndroid);
 };