Move requests from Show() argument to PermissionPrompt::Delegate

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 66e531746167d37f0b3d4f24f446215be22d5c5e..299d7986dfc2b23dd1e456a19164bbc260dc363d 100644
--- a/chrome/browser/permissions/permission_prompt_android.h
+++ b/chrome/browser/permissions/permission_prompt_android.h
@@ -11,8 +11,6 @@
 #include "chrome/browser/ui/permission_bubble/permission_prompt.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 
-class PermissionRequest;
-
 namespace content {
 class WebContents;
 }
@@ -24,8 +22,7 @@ class PermissionPromptAndroid : public PermissionPrompt {
 
   // PermissionPrompt:
   void SetDelegate(Delegate* delegate) override;
-  void Show(const std::vector<PermissionRequest*>& requests,
-            const std::vector<bool>& accept_state) override;
+  void Show() override;
   bool CanAcceptRequestUpdate() override;
   bool HidesAutomatically() override;
   void Hide() override;
@@ -37,7 +34,7 @@ class PermissionPromptAndroid : public PermissionPrompt {
   void Accept();
   void Deny();
 
-  size_t permission_count() const { return requests_.size(); }
+  size_t permission_count() const { return delegate_->Requests().size(); }

[raymes, 2017/05/11 01:17:54]

nit: we should probably move the implementation into the cc file:
size_t PermissionCount

[Timothy Loh, 2017/05/11 04:42:08]

Done.

   ContentSettingsType GetContentSettingType(size_t position) const;
   int GetIconIdForPermission(size_t position) const;
   base::string16 GetMessageTextFragment(size_t position) const;
@@ -49,8 +46,6 @@ class PermissionPromptAndroid : public PermissionPrompt {
   content::WebContents* web_contents_;
   // |delegate_| is the PermissionRequestManager, which owns this object.
   Delegate* delegate_;
-  // The current request being displayed (if any).
-  std::vector<PermissionRequest*> requests_;
 
   DISALLOW_COPY_AND_ASSIGN(PermissionPromptAndroid);
 };