chromium/src
0
Fork 0
Code Activity

[views_ax] Migrating OverrideHasPopup to new setters.

Browse Source 
This CL migrates callers from using OverrideHasPopup to the new
ViewAccessibility setters.

There is no behavior change.

For the time being we don't remove the OverrideHasPopup pipeline,
that is done in the follow up CLs. Those CLs will also update any
existing Views to use the new pipeline.

Bug: 325137417
Change-Id: I95b8e67b342d4676febf9035ede769305f39381a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5314289
Reviewed-by: Benjamin Beaudry <benjamin.beaudry@microsoft.com>
Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Javier Contreras <javiercon@microsoft.com>
Cr-Commit-Position: refs/heads/main@{#1267157}
This commit is contained in:
Javier Contreras Tenorio (from Dev Box)
2024-02-29 19:57:55 +00:00
committed by Chromium LUCI CQ
parent b12642d046
commit 000aabcdb4
9 changed files with 11 additions and 13 deletions

2
ash/search_box/search_box_view_base.cc

@ -514,7 +514,7 @@ views::ImageButton* SearchBoxViewBase::CreateFilterButton(
filter_button_ = filter_and_close_button_container_->AddChildView(
std::make_unique<SearchBoxImageButton>(button_callback));
filter_button_->GetViewAccessibility().SetRole(ax::mojom::Role::kPopUpButton);
filter_button_->GetViewAccessibility().OverrideHasPopup(
filter_button_->GetViewAccessibility().SetHasPopup(
ax::mojom::HasPopup::kMenu);
return filter_button_;
}

2
chrome/browser/ui/views/download/bubble/download_toolbar_button_view.cc

@ -166,7 +166,7 @@ DownloadToolbarButtonView::DownloadToolbarButtonView(BrowserView* browser_view)
? kDownloadToolbarButtonChromeRefreshIcon
: kDownloadToolbarButtonIcon,
kDownloadToolbarButtonIcon);
GetViewAccessibility().OverrideHasPopup(ax::mojom::HasPopup::kDialog);
GetViewAccessibility().SetHasPopup(ax::mojom::HasPopup::kDialog);
tooltip_texts_[0] = l10n_util::GetStringUTF16(IDS_TOOLTIP_DOWNLOAD_ICON);
SetTooltipText(tooltip_texts_.at(0));
SetVisible(false);

2
chrome/browser/ui/views/extensions/extensions_toolbar_button.cc

@ -83,7 +83,7 @@ ExtensionsToolbarButton::ExtensionsToolbarButton(
SetVectorIcon(GetIcon(state_));
GetViewAccessibility().OverrideHasPopup(ax::mojom::HasPopup::kMenu);
GetViewAccessibility().SetHasPopup(ax::mojom::HasPopup::kMenu);
// Do not flip the Extensions icon in RTL.
SetFlipCanvasOnPaintForRTLUI(false);

2
chrome/browser/ui/views/global_media_controls/media_toolbar_button_view.cc

@ -64,7 +64,7 @@ MediaToolbarButtonView::MediaToolbarButtonView(
kMediaToolbarButtonTouchIcon);
SetTooltipText(
l10n_util::GetStringUTF16(IDS_GLOBAL_MEDIA_CONTROLS_ICON_TOOLTIP_TEXT));
GetViewAccessibility().OverrideHasPopup(ax::mojom::HasPopup::kDialog);
GetViewAccessibility().SetHasPopup(ax::mojom::HasPopup::kDialog);
SetProperty(views::kElementIdentifierKey, kToolbarMediaButtonElementId);
// We start hidden and only show once |controller_| tells us to.

2
chrome/browser/ui/views/performance_controls/battery_saver_button.cc

@ -35,7 +35,7 @@ BatterySaverButton::BatterySaverButton(BrowserView* browser_view)
SetAccessibleName(
l10n_util::GetStringUTF16(IDS_BATTERY_SAVER_BUTTON_ACCNAME));
SetTooltipText(l10n_util::GetStringUTF16(IDS_BATTERY_SAVER_BUTTON_TOOLTIP));
GetViewAccessibility().OverrideHasPopup(ax::mojom::HasPopup::kDialog);
GetViewAccessibility().SetHasPopup(ax::mojom::HasPopup::kDialog);
SetProperty(views::kElementIdentifierKey,
kToolbarBatterySaverButtonElementId);

2
chrome/browser/ui/views/profiles/avatar_toolbar_button.cc

@ -93,7 +93,7 @@ AvatarToolbarButton::AvatarToolbarButton(BrowserView* browser_view)
// and LabelButton image/label placement is still flipped like usual.
SetFlipCanvasOnPaintForRTLUI(false);
GetViewAccessibility().OverrideHasPopup(ax::mojom::HasPopup::kMenu);
GetViewAccessibility().SetHasPopup(ax::mojom::HasPopup::kMenu);
// For consistency with identity representation, we need to have the avatar on
// the left and the (potential) user name on the right.

2
chrome/browser/ui/views/toolbar/chrome_labs/chrome_labs_button.cc

@ -41,7 +41,7 @@ ChromeLabsButton::ChromeLabsButton(BrowserView* browser_view,
button_controller()->set_notify_action(
views::ButtonController::NotifyAction::kOnPress);
GetViewAccessibility().SetRole(ax::mojom::Role::kPopUpButton);
GetViewAccessibility().OverrideHasPopup(ax::mojom::HasPopup::kDialog);
GetViewAccessibility().SetHasPopup(ax::mojom::HasPopup::kDialog);
new_experiments_indicator_ =
views::DotIndicator::Install(image_container_view());
UpdateDotIndicator();

2
chrome/browser/ui/views/toolbar/side_panel_toolbar_button.cc

@ -46,7 +46,7 @@ SidePanelToolbarButton::SidePanelToolbarButton(Browser* browser)
set_context_menu_controller(nullptr);
button_controller()->set_notify_action(
views::ButtonController::NotifyAction::kOnPress);
GetViewAccessibility().OverrideHasPopup(ax::mojom::HasPopup::kMenu);
GetViewAccessibility().SetHasPopup(ax::mojom::HasPopup::kMenu);
SetProperty(views::kElementIdentifierKey, kToolbarSidePanelButtonElementId);
}

8
ui/views/accessibility/view_ax_platform_node_delegate_unittest.cc

@ -982,13 +982,11 @@ TEST_F(ViewAXPlatformNodeDelegateTest, SetIsEnabled) {
EXPECT_FALSE(label_accessibility()->IsAccessibilityFocusable());
}
TEST_F(ViewAXPlatformNodeDelegateTest, OverrideHasPopup) {
TEST_F(ViewAXPlatformNodeDelegateTest, SetHasPopup) {
View::Views view_ids = SetUpExtraViews();
view_ids[1]->GetViewAccessibility().OverrideHasPopup(
ax::mojom::HasPopup::kTrue);
view_ids[2]->GetViewAccessibility().OverrideHasPopup(
ax::mojom::HasPopup::kMenu);
view_ids[1]->GetViewAccessibility().SetHasPopup(ax::mojom::HasPopup::kTrue);
view_ids[2]->GetViewAccessibility().SetHasPopup(ax::mojom::HasPopup::kMenu);
ui::AXNodeData node_data_0;
view_ids[0]->GetViewAccessibility().GetAccessibleNodeData(&node_data_0);