Commit fd886ff8 authored by Peter Kasting's avatar Peter Kasting Committed by Commit Bot

Change ButtonPressed overrides to callbacks: .../permission_bubble/

Bug: 772945
Change-Id: I7b52c1c6712a99ddc9fb417374820f5d2d0c2f97
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2469437
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Auto-Submit: Peter Kasting <pkasting@chromium.org>
Reviewed-by: default avatarAdrienne Porter Felt <felt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#817316}
parent a09d4cf3
...@@ -100,7 +100,14 @@ PermissionPromptBubbleView::PermissionPromptBubbleView( ...@@ -100,7 +100,14 @@ PermissionPromptBubbleView::PermissionPromptBubbleView(
ContentSettingsType::PLUGINS) { ContentSettingsType::PLUGINS) {
auto* learn_more_button = auto* learn_more_button =
SetExtraView(views::CreateVectorImageButtonWithNativeTheme( SetExtraView(views::CreateVectorImageButtonWithNativeTheme(
this, vector_icons::kHelpOutlineIcon)); base::BindRepeating(
[](Browser* browser) {
chrome::AddSelectedTabWithURL(
browser, GURL(chrome::kFlashDeprecationLearnMoreURL),
ui::PAGE_TRANSITION_LINK);
},
base::Unretained(browser)),
vector_icons::kHelpOutlineIcon));
learn_more_button->SetFocusForPlatform(); learn_more_button->SetFocusForPlatform();
learn_more_button->SetTooltipText( learn_more_button->SetTooltipText(
l10n_util::GetStringUTF16(IDS_LEARN_MORE)); l10n_util::GetStringUTF16(IDS_LEARN_MORE));
...@@ -247,14 +254,6 @@ base::string16 PermissionPromptBubbleView::GetAccessibleWindowTitle() const { ...@@ -247,14 +254,6 @@ base::string16 PermissionPromptBubbleView::GetAccessibleWindowTitle() const {
visible_requests_[1]->GetMessageTextFragment()); visible_requests_[1]->GetMessageTextFragment());
} }
void PermissionPromptBubbleView::ButtonPressed(views::Button* sender,
const ui::Event& event) {
DCHECK_EQ(sender, GetExtraView());
chrome::AddSelectedTabWithURL(browser_,
GURL(chrome::kFlashDeprecationLearnMoreURL),
ui::PAGE_TRANSITION_LINK);
}
PermissionPromptBubbleView::DisplayNameOrOrigin PermissionPromptBubbleView::DisplayNameOrOrigin
PermissionPromptBubbleView::GetDisplayNameOrOrigin() const { PermissionPromptBubbleView::GetDisplayNameOrOrigin() const {
DCHECK(!visible_requests_.empty()); DCHECK(!visible_requests_.empty());
......
...@@ -9,14 +9,12 @@ ...@@ -9,14 +9,12 @@
#include "base/strings/string16.h" #include "base/strings/string16.h"
#include "components/permissions/permission_prompt.h" #include "components/permissions/permission_prompt.h"
#include "ui/views/bubble/bubble_dialog_delegate_view.h" #include "ui/views/bubble/bubble_dialog_delegate_view.h"
#include "ui/views/controls/button/button.h"
class Browser; class Browser;
// Bubble that prompts the user to grant or deny a permission request from a // Bubble that prompts the user to grant or deny a permission request from a
// website. // website.
class PermissionPromptBubbleView : public views::ButtonListener, class PermissionPromptBubbleView : public views::BubbleDialogDelegateView {
public views::BubbleDialogDelegateView {
public: public:
PermissionPromptBubbleView(Browser* browser, PermissionPromptBubbleView(Browser* browser,
permissions::PermissionPrompt::Delegate* delegate, permissions::PermissionPrompt::Delegate* delegate,
...@@ -35,9 +33,6 @@ class PermissionPromptBubbleView : public views::ButtonListener, ...@@ -35,9 +33,6 @@ class PermissionPromptBubbleView : public views::ButtonListener,
base::string16 GetAccessibleWindowTitle() const override; base::string16 GetAccessibleWindowTitle() const override;
base::string16 GetWindowTitle() const override; base::string16 GetWindowTitle() const override;
// Button Listener
void ButtonPressed(views::Button* sender, const ui::Event& event) override;
void AcceptPermission(); void AcceptPermission();
void DenyPermission(); void DenyPermission();
void ClosingPermission(); void ClosingPermission();
......
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