Page Info (Views): remove images from accessibility order

chrome/browser/ui/views/website_settings/permission_selector_row.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/website_settings/permission_selector_row.h"
 
 #include "base/i18n/rtl.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/ui/views/website_settings/non_accessible_image_view.h"
 #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h"
 #include "chrome/browser/ui/website_settings/permission_menu_model.h"
 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
 #include "chrome/grit/generated_resources.h"
+#include "ui/accessibility/ax_enums.h"

[msw, 2016/11/11 15:55:01]

nit: remove

[lgarron, 2016/11/11 22:28:51]

Removed.

 #include "ui/accessibility/ax_node_data.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/controls/combobox/combobox_listener.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 // Minimum distance between the label and its corresponding menu.
 const int kMinSeparationBetweenLabelAndMenu = 16;
-}
+

[msw, 2016/11/11 15:55:01]

nit: remove blank line, or add a matching one above the comment.

[lgarron, 2016/11/11 22:28:51]

Removed.

+}  // namespace
 
 namespace internal {
 
 // The |PermissionMenuButton| provides a menu for selecting a setting a
 // permissions type.
 class PermissionMenuButton : public views::MenuButton,
                              public views::MenuButtonListener {
  public:
   // Creates a new |PermissionMenuButton| with the passed |text|. The ownership
   // of the |model| remains with the caller and is not transfered to the
@@ skipping 202 matching lines @@
                         0);
   column_set->AddPaddingColumn(0, kPermissionIconMarginLeft);
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 0,
                         views::GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(1, kMinSeparationBetweenLabelAndMenu);
   column_set->AddColumn(views::GridLayout::TRAILING, views::GridLayout::FILL, 0,
                         views::GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(1, column_set_id);
   // Create the permission icon.
-  icon_ = new views::ImageView();
+  icon_ = new NonAccessibleImageView();
   const gfx::Image& image = WebsiteSettingsUI::GetPermissionIcon(permission);
   icon_->SetImage(image.ToImageSkia());
   layout->AddView(icon_,
                   1,
                   1,
                   views::GridLayout::CENTER,
                   views::GridLayout::CENTER);
   // Create the label that displays the permission type.
   views::Label* label = new views::Label(
       WebsiteSettingsUI::PermissionTypeToUIString(permission.type));
@@ skipping 97 matching lines @@
         permission.default_setting, content_settings::SETTING_SOURCE_USER));
     menu_button_->SizeToPreferredSize();
   } else if (combobox_) {
     bool use_default = permission.setting == CONTENT_SETTING_DEFAULT;
     combobox_->UpdateSelectedIndex(use_default);
   }
 
   for (PermissionSelectorRowObserver& observer : observer_list_)
     observer.OnPermissionChanged(permission);
 }