Commit d9fe9b45 authored by Timothy Loh's avatar Timothy Loh Committed by Commit Bot

Minor clean-ups to GroupedPermissionInfoBarDelegate

- Remove unused requesting_origin_
- Make destructor private
- Remove unused GetAcceptState() declaration

Change-Id: Ie8a8984d2a6975568cd8b26e57c0844c88acb594
Reviewed-on: https://chromium-review.googlesource.com/575737Reviewed-by: default avatarRaymes Khoury <raymes@chromium.org>
Commit-Queue: Timothy Loh <timloh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#488120}
parent 739b7048
...@@ -22,11 +22,10 @@ GroupedPermissionInfoBarDelegate::~GroupedPermissionInfoBarDelegate() {} ...@@ -22,11 +22,10 @@ GroupedPermissionInfoBarDelegate::~GroupedPermissionInfoBarDelegate() {}
// static // static
infobars::InfoBar* GroupedPermissionInfoBarDelegate::Create( infobars::InfoBar* GroupedPermissionInfoBarDelegate::Create(
const base::WeakPtr<PermissionPromptAndroid>& permission_prompt, const base::WeakPtr<PermissionPromptAndroid>& permission_prompt,
InfoBarService* infobar_service, InfoBarService* infobar_service) {
const GURL& requesting_origin) { return infobar_service->AddInfoBar(
return infobar_service->AddInfoBar(base::MakeUnique<GroupedPermissionInfoBar>( base::MakeUnique<GroupedPermissionInfoBar>(base::WrapUnique(
base::WrapUnique(new GroupedPermissionInfoBarDelegate( new GroupedPermissionInfoBarDelegate(permission_prompt))));
permission_prompt, requesting_origin))));
} }
size_t GroupedPermissionInfoBarDelegate::PermissionCount() const { size_t GroupedPermissionInfoBarDelegate::PermissionCount() const {
...@@ -80,11 +79,8 @@ base::string16 GroupedPermissionInfoBarDelegate::GetLinkText() const { ...@@ -80,11 +79,8 @@ base::string16 GroupedPermissionInfoBarDelegate::GetLinkText() const {
} }
GroupedPermissionInfoBarDelegate::GroupedPermissionInfoBarDelegate( GroupedPermissionInfoBarDelegate::GroupedPermissionInfoBarDelegate(
const base::WeakPtr<PermissionPromptAndroid>& permission_prompt, const base::WeakPtr<PermissionPromptAndroid>& permission_prompt)
const GURL& requesting_origin) : persist_(true), permission_prompt_(permission_prompt) {
: requesting_origin_(requesting_origin),
persist_(true),
permission_prompt_(permission_prompt) {
DCHECK(permission_prompt); DCHECK(permission_prompt);
} }
......
...@@ -26,8 +26,7 @@ class GroupedPermissionInfoBarDelegate : public ConfirmInfoBarDelegate { ...@@ -26,8 +26,7 @@ class GroupedPermissionInfoBarDelegate : public ConfirmInfoBarDelegate {
static infobars::InfoBar* Create( static infobars::InfoBar* Create(
const base::WeakPtr<PermissionPromptAndroid>& permission_prompt, const base::WeakPtr<PermissionPromptAndroid>& permission_prompt,
InfoBarService* infobar_service, InfoBarService* infobar_service);
const GURL& requesting_origin);
bool persist() const { return persist_; } bool persist() const { return persist_; }
void set_persist(bool persist) { persist_ = persist; } void set_persist(bool persist) { persist_ = persist; }
...@@ -49,13 +48,9 @@ class GroupedPermissionInfoBarDelegate : public ConfirmInfoBarDelegate { ...@@ -49,13 +48,9 @@ class GroupedPermissionInfoBarDelegate : public ConfirmInfoBarDelegate {
void InfoBarDismissed() override; void InfoBarDismissed() override;
base::string16 GetLinkText() const override; base::string16 GetLinkText() const override;
protected:
bool GetAcceptState(size_t position);
private: private:
GroupedPermissionInfoBarDelegate( GroupedPermissionInfoBarDelegate(
const base::WeakPtr<PermissionPromptAndroid>& permission_prompt, const base::WeakPtr<PermissionPromptAndroid>& permission_prompt);
const GURL& requesting_origin);
// ConfirmInfoBarDelegate: // ConfirmInfoBarDelegate:
InfoBarIdentifier GetIdentifier() const override; InfoBarIdentifier GetIdentifier() const override;
...@@ -67,7 +62,6 @@ class GroupedPermissionInfoBarDelegate : public ConfirmInfoBarDelegate { ...@@ -67,7 +62,6 @@ class GroupedPermissionInfoBarDelegate : public ConfirmInfoBarDelegate {
// InfoBarDelegate: // InfoBarDelegate:
bool EqualsDelegate(infobars::InfoBarDelegate* delegate) const override; bool EqualsDelegate(infobars::InfoBarDelegate* delegate) const override;
const GURL requesting_origin_;
// Whether the accept/deny decision is persisted. // Whether the accept/deny decision is persisted.
bool persist_; bool persist_;
base::WeakPtr<PermissionPromptAndroid> permission_prompt_; base::WeakPtr<PermissionPromptAndroid> permission_prompt_;
......
...@@ -41,9 +41,8 @@ PermissionPromptAndroid::PermissionPromptAndroid( ...@@ -41,9 +41,8 @@ PermissionPromptAndroid::PermissionPromptAndroid(
if (!infobar_service) if (!infobar_service)
return; return;
GroupedPermissionInfoBarDelegate::Create( GroupedPermissionInfoBarDelegate::Create(weak_factory_.GetWeakPtr(),
weak_factory_.GetWeakPtr(), infobar_service, infobar_service);
delegate_->Requests()[0]->GetOrigin());
} }
PermissionPromptAndroid::~PermissionPromptAndroid() {} PermissionPromptAndroid::~PermissionPromptAndroid() {}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment