chromium/src
0
Fork 0
Code Activity

Use constructor instead of set_callback() where possible.

Browse Source 
I didn't realize this existed when I wrote the initial change.

Bug: 772945
Change-Id: Ib4dd142fc06b42f02c38811a7684f5564481471f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2433587
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Reviewed-by: Alex Newcomer <newcomer@chromium.org>
Reviewed-by: Trent Apted <tapted@chromium.org>
Auto-Submit: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#811517}
This commit is contained in:
Peter Kasting
2020-09-29 02:39:43 +00:00
committed by Commit Bot
parent c858d6a395
commit 1df7be1fed
2 changed files with 14 additions and 15 deletions

21
apps/ui/views/app_window_frame_view.cc

@ -53,8 +53,7 @@ AppWindowFrameView::~AppWindowFrameView() = default;
void AppWindowFrameView::Init() { void AppWindowFrameView::Init() {
if (draw_frame_) { if (draw_frame_) {
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
auto close_button = std::make_unique<views::ImageButton>(); auto close_button = std::make_unique<views::ImageButton>(
close_button->set_callback(
base::BindRepeating(&views::Widget::Close, base::Unretained(widget_))); base::BindRepeating(&views::Widget::Close, base::Unretained(widget_)));
close_button->SetImage( close_button->SetImage(
views::Button::STATE_NORMAL, views::Button::STATE_NORMAL,
@ -69,9 +68,9 @@ void AppWindowFrameView::Init() {
l10n_util::GetStringUTF16(IDS_APP_ACCNAME_CLOSE)); l10n_util::GetStringUTF16(IDS_APP_ACCNAME_CLOSE));
close_button_ = AddChildView(std::move(close_button)); close_button_ = AddChildView(std::move(close_button));
// STATE_NORMAL images are set in SetButtonImagesForFrame, not here. // STATE_NORMAL images are set in SetButtonImagesForFrame, not here.
auto maximize_button = std::make_unique<views::ImageButton>(); auto maximize_button =
maximize_button->set_callback(base::BindRepeating( std::make_unique<views::ImageButton>(base::BindRepeating(
&views::Widget::Maximize, base::Unretained(widget_))); &views::Widget::Maximize, base::Unretained(widget_)));
maximize_button->SetImage( maximize_button->SetImage(
views::Button::STATE_HOVERED, views::Button::STATE_HOVERED,
rb.GetNativeImageNamed(IDR_APP_WINDOW_MAXIMIZE_H).ToImageSkia()); rb.GetNativeImageNamed(IDR_APP_WINDOW_MAXIMIZE_H).ToImageSkia());
@ -84,9 +83,9 @@ void AppWindowFrameView::Init() {
maximize_button->SetAccessibleName( maximize_button->SetAccessibleName(
l10n_util::GetStringUTF16(IDS_APP_ACCNAME_MAXIMIZE)); l10n_util::GetStringUTF16(IDS_APP_ACCNAME_MAXIMIZE));
maximize_button_ = AddChildView(std::move(maximize_button)); maximize_button_ = AddChildView(std::move(maximize_button));
auto restore_button = std::make_unique<views::ImageButton>(); auto restore_button =
restore_button->set_callback(base::BindRepeating( std::make_unique<views::ImageButton>(base::BindRepeating(
&views::Widget::Restore, base::Unretained(widget_))); &views::Widget::Restore, base::Unretained(widget_)));
restore_button->SetImage( restore_button->SetImage(
views::Button::STATE_HOVERED, views::Button::STATE_HOVERED,
rb.GetNativeImageNamed(IDR_APP_WINDOW_RESTORE_H).ToImageSkia()); rb.GetNativeImageNamed(IDR_APP_WINDOW_RESTORE_H).ToImageSkia());
@ -96,9 +95,9 @@ void AppWindowFrameView::Init() {
restore_button->SetAccessibleName( restore_button->SetAccessibleName(
l10n_util::GetStringUTF16(IDS_APP_ACCNAME_RESTORE)); l10n_util::GetStringUTF16(IDS_APP_ACCNAME_RESTORE));
restore_button_ = AddChildView(std::move(restore_button)); restore_button_ = AddChildView(std::move(restore_button));
auto minimize_button = std::make_unique<views::ImageButton>(); auto minimize_button =
minimize_button->set_callback(base::BindRepeating( std::make_unique<views::ImageButton>(base::BindRepeating(
&views::Widget::Minimize, base::Unretained(widget_))); &views::Widget::Minimize, base::Unretained(widget_)));
minimize_button->SetImage( minimize_button->SetImage(
views::Button::STATE_HOVERED, views::Button::STATE_HOVERED,
rb.GetNativeImageNamed(IDR_APP_WINDOW_MINIMIZE_H).ToImageSkia()); rb.GetNativeImageNamed(IDR_APP_WINDOW_MINIMIZE_H).ToImageSkia());

8
ash/clipboard/views/clipboard_history_item_view.cc

@ -110,10 +110,10 @@ class ash::ClipboardHistoryItemView::MainButton : public views::Button {
ClipboardHistoryItemView::DeleteButton::DeleteButton( ClipboardHistoryItemView::DeleteButton::DeleteButton(
ClipboardHistoryItemView* listener) ClipboardHistoryItemView* listener)
: views::ImageButton() { : views::ImageButton(
set_callback(base::BindRepeating(&ClipboardHistoryItemView::ExecuteCommand, base::BindRepeating(&ClipboardHistoryItemView::ExecuteCommand,
base::Unretained(listener), base::Unretained(listener),
ClipboardHistoryUtil::kDeleteCommandId)); ClipboardHistoryUtil::kDeleteCommandId)) {
SetFocusBehavior(FocusBehavior::ACCESSIBLE_ONLY); SetFocusBehavior(FocusBehavior::ACCESSIBLE_ONLY);
SetAccessibleName(base::ASCIIToUTF16(std::string(GetClassName()))); SetAccessibleName(base::ASCIIToUTF16(std::string(GetClassName())));
SetImageHorizontalAlignment(views::ImageButton::ALIGN_CENTER); SetImageHorizontalAlignment(views::ImageButton::ALIGN_CENTER);