Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3452)

Unified Diff: chrome/browser/permissions/permission_prompt_android.h

Issue 2868783002: Move requests from Show() argument to PermissionPrompt::Delegate (Closed)
Patch Set: tweak comment Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..ab47330e270a457854713b9771f644f14039efc7 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 PermissionCount() const;
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);
};

Powered by Google App Engine
This is Rietveld 408576698