Remove SetAssociatedLabel functions; use View::SetAccessibleName instead

View::SetAccessibleName can be called with a labelling view and does
the very same work that several views' SetAssociatedLabel does.

* Remove SetAssociatedLabel from EditableCombobox, which has no callers
* Remove SetAssociatedLabel from Textfield, and Checkbox and replace all
  uses with SetAccessibleName

AX-Relnotes: n/a

Bug: 1406781, 1363612
Change-Id: Ib0e64227eb02c5e5a77285308b06d22a990f7523
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4370264
Reviewed-by: Allen Bauer <kylixrd@chromium.org>
Reviewed-by: Avi Drissman <avi@chromium.org>
Commit-Queue: Joanmarie Diggs <jdiggs@igalia.com>
Cr-Commit-Position: refs/heads/main@{#1123094}

Author: joanmarie

chrome/browser/ash/notifications/request_system_proxy_credentials_view.cc

@@ -159,7 +159,7 @@ void RequestSystemProxyCredentialsView::Init() {
   username_textfield_ =
       auth_container->AddChildView(std::make_unique<views::Textfield>());
   username_textfield_->SetEnabled(true);
-  username_textfield_->SetAssociatedLabel(username_label);
+  username_textfield_->SetAccessibleName(username_label);
 
   const int related_vertical_spacing =
       provider->GetDistanceMetric(views::DISTANCE_RELATED_CONTROL_VERTICAL);
@@ -173,7 +173,7 @@ void RequestSystemProxyCredentialsView::Init() {
   password_textfield_ = auth_container->AddChildView(
       std::make_unique<chromeos::PassphraseTextfield>());
   password_textfield_->SetEnabled(true);
-  password_textfield_->SetAssociatedLabel(password_label);
+  password_textfield_->SetAccessibleName(password_label);
   auth_container->AddPaddingRow(views::TableLayout::kFixedSize,
                                 related_vertical_spacing);
 

chrome/browser/ash/notifications/request_system_proxy_credentials_view_unittest.cc

@@ -13,7 +13,9 @@
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_dialogs.h"
+#include "chrome/grit/generated_resources.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
+#include "ui/base/l10n/l10n_util.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/textfield/textfield.h"
 
@@ -114,4 +116,46 @@ TEST_F(RequestSystemProxyCredentialsViewTest, ErrorLabelVisible) {
   EXPECT_TRUE(system_proxy_dialog_->error_label_for_testing()->GetVisible());
 }
 
+TEST_F(RequestSystemProxyCredentialsViewTest, TextfieldAccessibility) {
+  CreateDialog(/*show_error=*/false);
+
+  ui::AXNodeData username_data;
+  auto* username_field = system_proxy_dialog_->username_textfield_for_testing();
+  username_field->GetAccessibleNodeData(&username_data);
+  EXPECT_EQ(username_data.role, ax::mojom::Role::kTextField);
+  EXPECT_EQ(username_field->GetAccessibleRole(), ax::mojom::Role::kTextField);
+  EXPECT_EQ(
+      username_data.GetString16Attribute(ax::mojom::StringAttribute::kName),
+      l10n_util::GetStringUTF16(IDS_SYSTEM_PROXY_AUTH_DIALOG_USERNAME_LABEL));
+  EXPECT_EQ(
+      username_field->GetAccessibleName(),
+      l10n_util::GetStringUTF16(IDS_SYSTEM_PROXY_AUTH_DIALOG_USERNAME_LABEL));
+  EXPECT_EQ(username_data.GetNameFrom(), ax::mojom::NameFrom::kRelatedElement);
+  EXPECT_TRUE(username_data.HasIntListAttribute(
+      ax::mojom::IntListAttribute::kLabelledbyIds));
+  EXPECT_TRUE(username_data.HasState(ax::mojom::State::kEditable));
+  EXPECT_FALSE(username_data.HasState(ax::mojom::State::kProtected));
+  EXPECT_EQ(username_data.GetDefaultActionVerb(),
+            ax::mojom::DefaultActionVerb::kActivate);
+
+  ui::AXNodeData password_data;
+  auto* password_field = system_proxy_dialog_->password_textfield_for_testing();
+  password_field->GetAccessibleNodeData(&password_data);
+  EXPECT_EQ(password_data.role, ax::mojom::Role::kTextField);
+  EXPECT_EQ(password_field->GetAccessibleRole(), ax::mojom::Role::kTextField);
+  EXPECT_EQ(
+      password_data.GetString16Attribute(ax::mojom::StringAttribute::kName),
+      l10n_util::GetStringUTF16(IDS_SYSTEM_PROXY_AUTH_DIALOG_PASSWORD_LABEL));
+  EXPECT_EQ(
+      password_field->GetAccessibleName(),
+      l10n_util::GetStringUTF16(IDS_SYSTEM_PROXY_AUTH_DIALOG_PASSWORD_LABEL));
+  EXPECT_EQ(password_data.GetNameFrom(), ax::mojom::NameFrom::kRelatedElement);
+  EXPECT_TRUE(password_data.HasIntListAttribute(
+      ax::mojom::IntListAttribute::kLabelledbyIds));
+  EXPECT_TRUE(password_data.HasState(ax::mojom::State::kEditable));
+  EXPECT_TRUE(password_data.HasState(ax::mojom::State::kProtected));
+  EXPECT_EQ(password_data.GetDefaultActionVerb(),
+            ax::mojom::DefaultActionVerb::kActivate);
+}
+
 }  // namespace ash

chrome/browser/enterprise/connectors/analysis/content_analysis_dialog.cc

@@ -917,7 +917,7 @@ void ContentAnalysisDialog::AddJustificationTextAreaToDialog() {
 
   bypass_justification_ =
       contents_layout_->AddChildView(std::make_unique<views::Textarea>());
-  bypass_justification_->SetAssociatedLabel(justification_text_label_);
+  bypass_justification_->SetAccessibleName(justification_text_label_);
   bypass_justification_->SetController(this);
 }
 

chrome/browser/enterprise/connectors/analysis/content_analysis_dialog_browsertest.cc

@@ -25,8 +25,10 @@
 #include "components/enterprise/common/proto/connectors.pb.h"
 #include "components/prefs/scoped_user_pref_update.h"
 #include "content/public/test/browser_test.h"
+#include "ui/accessibility/ax_node_data.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/views/accessibility/view_accessibility.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/textarea/textarea.h"
 #include "ui/views/controls/throbber.h"
@@ -1049,6 +1051,43 @@ IN_PROC_BROWSER_TEST_F(ContentAnalysisDialogPlainTests,
   EXPECT_EQ(1, times_discard_called_);
 }
 
+IN_PROC_BROWSER_TEST_F(ContentAnalysisDialogPlainTests,
+                       BypassJustificationLabelAndTextareaAccessibility) {
+  enterprise_connectors::ContentAnalysisDialog::
+      SetMinimumPendingDialogTimeForTesting(base::Milliseconds(0));
+  std::unique_ptr<MockDelegate> delegate = std::make_unique<MockDelegate>();
+  delegate->SetBypassRequiresJustification(true);
+  ContentAnalysisDialog* dialog = CreateContentAnalysisDialog(
+      std::move(delegate), FinalContentAnalysisResult::SUCCESS);
+  dialog->ShowResult(FinalContentAnalysisResult::WARNING);
+
+  // We need the label and its `AXNodeData` to verify that the textarea's name
+  // matches the name of the label, and that the textarea's labelledby id is
+  // the accessible id of the label.
+  auto* label = dialog->GetBypassJustificationLabelForTesting();
+  EXPECT_TRUE(label);
+  ui::AXNodeData label_data;
+  label->GetViewAccessibility().GetAccessibleNodeData(&label_data);
+
+  auto* textarea = dialog->GetBypassJustificationTextareaForTesting();
+  EXPECT_TRUE(textarea);
+  ui::AXNodeData textarea_data;
+  textarea->GetViewAccessibility().GetAccessibleNodeData(&textarea_data);
+  EXPECT_EQ(textarea_data.role, ax::mojom::Role::kTextField);
+  EXPECT_EQ(textarea->GetAccessibleRole(), ax::mojom::Role::kTextField);
+  EXPECT_EQ(
+      textarea_data.GetString16Attribute(ax::mojom::StringAttribute::kName),
+      label->GetAccessibleName());
+  EXPECT_EQ(textarea_data.GetNameFrom(), ax::mojom::NameFrom::kRelatedElement);
+  EXPECT_EQ(textarea_data.GetIntListAttribute(
+                ax::mojom::IntListAttribute::kLabelledbyIds)[0],
+            label_data.id);
+  EXPECT_TRUE(textarea_data.HasState(ax::mojom::State::kEditable));
+  EXPECT_FALSE(textarea_data.HasState(ax::mojom::State::kProtected));
+  EXPECT_EQ(textarea_data.GetDefaultActionVerb(),
+            ax::mojom::DefaultActionVerb::kActivate);
+}
+
 class ContentAnalysysDialogUiTest
     : public DialogBrowserTest,
       public testing::WithParamInterface<std::tuple<bool, bool, bool>> {

chrome/browser/ui/views/apps/app_dialog/app_uninstall_dialog_view.cc

@@ -88,7 +88,7 @@ class UninstallCheckboxView : public views::View,
         .AddRows(1, views::TableLayout::kFixedSize);
 
     auto checkbox = std::make_unique<views::Checkbox>();
-    checkbox->SetAssociatedLabel(label.get());
+    checkbox->SetAccessibleName(label.get());
     checkbox_targeter_ = std::make_unique<CheckboxTargeter>();
     checkbox->SetEventTargeter(
         std::make_unique<views::ViewTargeter>(checkbox_targeter_.get()));

chrome/browser/ui/views/autofill/payments/card_unmask_otp_input_dialog_views.cc

@@ -82,7 +82,7 @@ void CardUnmaskOtpInputDialogViews::ShowInvalidState(
   otp_input_textfield_invalid_label_->SetVisible(true);
   otp_input_textfield_invalid_label_->SetText(invalid_label_text);
   otp_input_textfield_invalid_label_padding_->SetVisible(false);
-  otp_input_textfield_->SetAssociatedLabel(otp_input_textfield_invalid_label_);
+  otp_input_textfield_->SetAccessibleName(otp_input_textfield_invalid_label_);
 }
 
 void CardUnmaskOtpInputDialogViews::Dismiss(
@@ -256,7 +256,7 @@ void CardUnmaskOtpInputDialogViews::HideInvalidState() {
   otp_input_textfield_->SetInvalid(false);
   otp_input_textfield_invalid_label_->SetText(std::u16string());
   otp_input_textfield_invalid_label_->SetVisible(false);
-  otp_input_textfield_->SetAssociatedLabel(otp_input_textfield_invalid_label_);
+  otp_input_textfield_->SetAccessibleName(otp_input_textfield_invalid_label_);
   otp_input_textfield_invalid_label_padding_->SetVisible(true);
 }
 

chrome/browser/ui/views/autofill/payments/migratable_card_view.cc

@@ -121,7 +121,7 @@ MigratableCardView::GetMigratableCardDescriptionView(
         // format.
         views::InkDrop::Get(checkbox_)->SetMode(
             views::InkDropHost::InkDropMode::OFF);
-        checkbox_->SetAssociatedLabel(card_description.get());
+        checkbox_->SetAccessibleName(card_description.get());
       }
       break;
     }

chrome/browser/ui/views/bluetooth_device_credentials_view.cc

@@ -145,7 +145,7 @@ void BluetoothDeviceCredentialsView::InitControls(
     passkey_text_->SetDefaultWidthInChars(kDefaultTextfieldNumChars);
     passkey_text_->SetMinimumWidthInChars(kMinimumTextfieldNumChars);
     passkey_text_->SetTextInputType(ui::TEXT_INPUT_TYPE_TEXT);
-    passkey_text_->SetAssociatedLabel(passkey_prompt_label_ptr);
+    passkey_text_->SetAccessibleName(passkey_prompt_label_ptr);
     // TODO(cmumford): Windows Narrator says "no item in view".
   }
 

chrome/browser/ui/views/cookie_info_view.cc

@@ -179,7 +179,7 @@ views::Textfield* CookieInfoView::AddTextfieldRow(views::TableLayout* layout,
       l10n_util::GetStringUTF16(label_message_id)));
   auto* textfield = contents()->AddChildView(
       std::make_unique<GestureScrollableTextfield>(this));
-  textfield->SetAssociatedLabel(label);
+  textfield->SetAccessibleName(label);
   textfield->SetReadOnly(true);
   textfield->SetBorder(views::NullBorder());
 

chrome/browser/ui/views/crypto_module_password_dialog_view.cc

@@ -125,7 +125,7 @@ void CryptoModulePasswordDialogView::Init(const std::string& hostname,
       password_container->AddChildView(std::make_unique<views::Textfield>());
   password_entry_->SetTextInputType(ui::TEXT_INPUT_TYPE_PASSWORD);
   password_entry_->set_controller(this);
-  password_entry_->SetAssociatedLabel(password_label_);
+  password_entry_->SetAccessibleName(password_label_);
   password_container->SetFlexForView(password_entry_, 1);
 }
 

chrome/browser/ui/views/login_view.cc

@@ -77,14 +77,14 @@ LoginView::LoginView(const std::u16string& authority,
           views::style::CONTEXT_LABEL, views::style::STYLE_PRIMARY));
   username_field_ =
       fields_container->AddChildView(std::make_unique<views::Textfield>());
-  username_field_->SetAssociatedLabel(username_label);
+  username_field_->SetAccessibleName(username_label);
   auto* password_label =
       fields_container->AddChildView(std::make_unique<views::Label>(
           l10n_util::GetStringUTF16(IDS_LOGIN_DIALOG_PASSWORD_FIELD),
           views::style::CONTEXT_LABEL, views::style::STYLE_PRIMARY));
   password_field_ =
       fields_container->AddChildView(std::make_unique<views::Textfield>());
-  password_field_->SetAssociatedLabel(password_label);
+  password_field_->SetAccessibleName(password_label);
   password_field_->SetTextInputType(ui::TEXT_INPUT_TYPE_PASSWORD);
 
   if (http_auth_manager_) {

chrome/browser/ui/views/notifications/request_pin_view_chromeos.cc

@@ -178,7 +178,7 @@ void RequestPinView::Init() {
   textfield_ = AddChildView(std::make_unique<chromeos::PassphraseTextfield>());
   textfield_->set_controller(this);
   textfield_->SetEnabled(true);
-  textfield_->SetAssociatedLabel(header_label_);
+  textfield_->SetAccessibleName(header_label_);
   textfield_->SetDefaultWidthInChars(kDefaultTextWidthChars);
 
   // Error label.

chrome/browser/ui/views/passwords/password_save_unsynced_credentials_locally_view.cc

@@ -100,7 +100,7 @@ void PasswordSaveUnsyncedCredentialsLocallyView::CreateLayout() {
     checkbox->SetChecked(true);
     num_selected_checkboxes_++;
     auto* username_label = row_view->AddChildView(CreateUsernameLabel(form));
-    checkbox->SetAssociatedLabel(username_label);
+    checkbox->SetAccessibleName(username_label);
     auto* password_label = row_view->AddChildView(CreatePasswordLabel(form));
     auto* row_layout =
         row_view->SetLayoutManager(std::make_unique<views::BoxLayout>(

chrome/browser/ui/views/webauthn/authenticator_client_pin_entry_view.cc

@@ -34,7 +34,7 @@ class PinTextfield : public views::Textfield {
     SetDefaultWidthInChars(20);
 
     set_controller(controller);
-    SetAssociatedLabel(label);
+    SetAccessibleName(label);
   }
   PinTextfield(const PinTextfield&) = delete;
   PinTextfield& operator=(const PinTextfield&) = delete;

ui/views/accessibility/view_ax_platform_node_delegate_win_unittest.cc

@@ -151,7 +151,7 @@ TEST_F(ViewAXPlatformNodeDelegateWinTest, TextfieldAssociatedLabel) {
   Label* label = new Label(u"Label");
   content->AddChildView(label);
   Textfield* textfield = new Textfield;
-  textfield->SetAssociatedLabel(label);
+  textfield->SetAccessibleName(label);
   content->AddChildView(textfield);
 
   ComPtr<IAccessible> content_accessible(content->GetNativeViewAccessible());

ui/views/bubble/bubble_dialog_model_host.cc

@@ -169,7 +169,9 @@ class CheckboxControl : public Checkbox {
         DISTANCE_RELATED_LABEL_HORIZONTAL));
     layout->set_cross_axis_alignment(BoxLayout::CrossAxisAlignment::kStart);
 
-    SetAssociatedLabel(label.get());
+    // TODO(accessibility): There is no `SetAccessibilityProperties` which takes
+    // a labelling view to set the accessible name.
+    SetAccessibleName(label.get());
 
     AddChildView(std::move(label));
   }

ui/views/controls/button/checkbox.cc

@@ -128,20 +128,6 @@ bool Checkbox::GetMultiLine() const {
   return label()->GetMultiLine();
 }
 
-void Checkbox::SetAssociatedLabel(View* labelling_view) {
-  DCHECK(labelling_view);
-  GetViewAccessibility().OverrideLabelledBy(labelling_view);
-  ui::AXNodeData node_data;
-  labelling_view->GetAccessibleNodeData(&node_data);
-  // Labelled-by relations are not common practice in native UI, so we also
-  // set the checkbox accessible name for ATs which don't support that.
-  // TODO(aleventhal) automatically handle setting the name from the related
-  // label in ViewAccessibility and have it update the name if the text of the
-  // associated label changes.
-  SetAccessibleName(
-      node_data.GetString16Attribute(ax::mojom::StringAttribute::kName));
-}
-
 void Checkbox::SetCheckedIconImageColor(SkColor color) {
   checked_icon_image_color_ = color;
 }

ui/views/controls/button/checkbox.h

@@ -45,12 +45,6 @@ class VIEWS_EXPORT Checkbox : public LabelButton {
   void SetMultiLine(bool multi_line);
   bool GetMultiLine() const;
 
-  // If the accessible name should be the same as the labelling view's text,
-  // use this. It will set the accessible label relationship and copy the
-  // accessible name from the labelling views's accessible name. Any view with
-  // an accessible name can be used, e.g. a Label, StyledLabel or Link.
-  void SetAssociatedLabel(View* labelling_view);
-
   void SetCheckedIconImageColor(SkColor color);
 
   // LabelButton:

ui/views/controls/button/checkbox_unittest.cc

@@ -11,6 +11,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "ui/accessibility/ax_enums.mojom.h"
 #include "ui/accessibility/ax_node_data.h"
+#include "ui/views/accessibility/view_accessibility.h"
 #include "ui/views/controls/styled_label.h"
 #include "ui/views/test/views_test_base.h"
 
@@ -57,13 +58,22 @@ TEST_F(CheckboxTest, AccessibilityTest) {
   const std::u16string label_text = u"Some label";
   StyledLabel label;
   label.SetText(label_text);
-  checkbox()->SetAssociatedLabel(&label);
+  checkbox()->SetAccessibleName(&label);
+
+  // Use `ViewAccessibility::GetAccessibleNodeData` so that we can get the
+  // label's accessible id to compare with the checkbox's labelled-by id.
+  ui::AXNodeData label_data;
+  label.GetViewAccessibility().GetAccessibleNodeData(&label_data);
 
   ui::AXNodeData ax_data;
   checkbox()->GetAccessibleNodeData(&ax_data);
   EXPECT_EQ(ax_data.GetString16Attribute(ax::mojom::StringAttribute::kName),
             label_text);
   EXPECT_EQ(checkbox()->GetAccessibleName(), label_text);
+  EXPECT_EQ(ax_data.GetNameFrom(), ax::mojom::NameFrom::kRelatedElement);
+  EXPECT_EQ(ax_data.GetIntListAttribute(
+                ax::mojom::IntListAttribute::kLabelledbyIds)[0],
+            label_data.id);
   EXPECT_EQ(ax_data.role, ax::mojom::Role::kCheckBox);
   EXPECT_EQ(checkbox()->GetAccessibleRole(), ax::mojom::Role::kCheckBox);
   EXPECT_EQ(ax_data.GetCheckedState(), ax::mojom::CheckedState::kFalse);

ui/views/controls/editable_combobox/editable_combobox.cc

@@ -437,10 +437,6 @@ void EditableCombobox::OnAccessibleNameChanged(const std::u16string& new_name) {
   }
 }
 
-void EditableCombobox::SetAssociatedLabel(View* labelling_view) {
-  textfield_->SetAssociatedLabel(labelling_view);
-}
-
 void EditableCombobox::SetMenuDecorationStrategy(
     std::unique_ptr<MenuDecorationStrategy> strategy) {
   DCHECK(menu_model_);

ui/views/controls/editable_combobox/editable_combobox.h

@@ -107,10 +107,6 @@ class VIEWS_EXPORT EditableCombobox
   // Selects the specified logical text range for the textfield.
   void SelectRange(const gfx::Range& range);
 
-  // Sets the associated label; use this instead of SetAccessibleName if there
-  // is a label associated with this combobox.
-  void SetAssociatedLabel(View* labelling_view);
-
  protected:
   // Sets the menu decoration strategy. Setting it triggers an update to the
   // menu.

ui/views/controls/textfield/textfield.cc

@@ -273,11 +273,6 @@ Textfield::~Textfield() {
   }
 }
 
-void Textfield::SetAssociatedLabel(View* labelling_view) {
-  DCHECK(labelling_view);
-  GetViewAccessibility().OverrideLabelledBy(labelling_view);
-}
-
 void Textfield::SetController(TextfieldController* controller) {
   controller_ = controller;
 }

ui/views/controls/textfield/textfield.h

@@ -59,7 +59,6 @@ class ScopedPasswordInputEnabler;
 
 namespace views {
 
-class Label;
 class MenuRunner;
 class TextfieldController;
 class ViewsTextServicesContextMenu;
@@ -304,12 +303,6 @@ class VIEWS_EXPORT Textfield : public View,
   // Clears Edit history.
   void ClearEditHistory();
 
-  // If the accessible name should be the same as the labelling view's text,
-  // use this. It will set the accessible label relationship and copy the
-  // accessible name from the labelling views's accessible name. Any view with
-  // an accessible name can be used, typically a Label, StyledLabel or Link.
-  void SetAssociatedLabel(View* labelling_view);
-
   // Set extra spacing placed between glyphs; used for obscured text styling.
   void SetObscuredGlyphSpacing(int spacing);