Page Info (native Mac): remove images from accessibility order

chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm

 // Copyright 2014 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.
 
 #import "chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.h"
 
 #import <AppKit/AppKit.h>
 
 #include <cmath>
 
@@ skipping 602 matching lines @@
   NSFont* font = bold ? [NSFont boldSystemFontOfSize:fontSize]
                       : [NSFont systemFontOfSize:fontSize];
   [textField setFont:font];
   [self sizeTextFieldHeightToFit:textField];
   [textField setAutoresizingMask:NSViewWidthSizable];
   [view addSubview:textField.get()];
   return textField.get();
 }
 
 // Add an image as a subview of the given view, placed at a pre-determined x
-// position and the given y position. Return the new NSImageView.
+// position and the given y position. The image is not in the accessibility
+// order, since the image is always accompanied by text in this bubble. Return
+// the new NSImageView.
 - (NSImageView*)addImageWithSize:(NSSize)size
                           toView:(NSView*)view
                          atPoint:(NSPoint)point {
   NSRect frame = NSMakeRect(point.x, point.y, size.width, size.height);
   base::scoped_nsobject<NSImageView> imageView(
       [[NSImageView alloc] initWithFrame:frame]);
+  [self hideImageFromAccessibilityOrder:imageView];
   [imageView setImageFrameStyle:NSImageFrameNone];
   [view addSubview:imageView.get()];
   return imageView.get();
 }
 
+// Hide the given image view from the accessibility order for VoiceOver.
+- (void)hideImageFromAccessibilityOrder:(NSImageView*)imageView {
+  // This is the minimum change necessary to get VoiceOver to skip the image
+  // (instead of reading the word "image"). Accessibility mechanisms in OSX
+  // change once in a while, so this may be fragile.
+  [[imageView cell] accessibilitySetOverrideValue:@""
+                                     forAttribute:NSAccessibilityRoleAttribute];
+}
+
 // Add a separator as a subview of the given view. Return the new view.
 - (NSView*)addSeparatorToView:(NSView*)view {
   // Use an arbitrary position; it will be adjusted in performLayout.
   NSBox* spacer = [self
       horizontalSeparatorWithFrame:NSMakeRect(0, 0, NSWidth([view frame]), 0)];
   [view addSubview:spacer];
   return spacer;
 }
 
 // Add a link button with the given text to |view|.
@@ skipping 578 matching lines @@
 void WebsiteSettingsUIBridge::SetPermissionInfo(
     const PermissionInfoList& permission_info_list,
     const ChosenObjectInfoList& chosen_object_info_list) {
   [bubble_controller_ setPermissionInfo:permission_info_list
                        andChosenObjects:chosen_object_info_list];
 }
 
 void WebsiteSettingsUIBridge::SetSelectedTab(TabId tab_id) {
   // TODO(lgarron): Remove this from the interface. (crbug.com/571533)
 }