Migrate accessibility from RenderView to RenderFrame.

content/browser/accessibility/browser_accessibility_cocoa.mm

 // 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 <execinfo.h>
 
 #import "content/browser/accessibility/browser_accessibility_cocoa.h"
 
 #include <map>
 
@@ skipping 1532 matching lines @@
 // that backs this object.
 - (void)accessibilityPerformAction:(NSString*)action {
   if (!browserAccessibility_)
     return;
 
   // TODO(dmazzoni): Support more actions.
   if ([action isEqualToString:NSAccessibilityPressAction]) {
     [self delegate]->AccessibilityDoDefaultAction(
         browserAccessibility_->GetId());
   } else if ([action isEqualToString:NSAccessibilityShowMenuAction]) {
-    [self delegate]->AccessibilityShowMenu(browserAccessibility_->GetId());
+    NSPoint objOrigin = [self origin];
+    NSSize size = [[self size] sizeValue];
+    gfx::Point origin = [self delegate]->AccessibilityOriginInScreen(
+        gfx::Rect(objOrigin.x, objOrigin.y, size.width, size.height));
+    origin.set_x(origin.x() + size.width / 2);
+    origin.set_y(origin.y() + size.width / 2);

[ncarter (slow), 2014/07/15 01:23:28]

Should this be size.height instead of .width?

You could also write these 2 lines as:

  origin.Offset(size.width()/2, size.height()/2);

Or maybe even :

  origin = gfx::Rect(origin, gfx::Size(NSSizeToCGSize(size)).CenterPoint();

[dmazzoni, 2014/07/15 07:55:03]

Good catch, thanks!

+    [self delegate]->AccessibilityShowMenu(origin);
   }
 }
 
 // Returns the description of the given action.
 - (NSString*)accessibilityActionDescription:(NSString*)action {
   if (!browserAccessibility_)
     return nil;
 
   return NSAccessibilityActionDescription(action);
 }
 
 // Sets an override value for a specific accessibility attribute.
 // This class does not support this.
 - (BOOL)accessibilitySetOverrideValue:(id)value
                          forAttribute:(NSString*)attribute {
   return NO;
 }
 
 // Sets the value for an accessibility attribute via the accessibility API.
 - (void)accessibilitySetValue:(id)value forAttribute:(NSString*)attribute {
   if (!browserAccessibility_)
     return;
 
   if ([attribute isEqualToString:NSAccessibilityFocusedAttribute]) {
+    BrowserAccessibilityManager* manager = browserAccessibility_->manager();
     NSNumber* focusedNumber = value;
     BOOL focused = [focusedNumber intValue];
     if (focused)
-      [self delegate]->AccessibilitySetFocus(browserAccessibility_->GetId());
+      manager->SetFocus(browserAccessibility_, true);
   }
   if ([attribute isEqualToString:NSAccessibilitySelectedTextRangeAttribute]) {
     NSRange range = [(NSValue*)value rangeValue];
     [self delegate]->AccessibilitySetTextSelection(
         browserAccessibility_->GetId(),
         range.location, range.location + range.length);
   }
 }
 
 // Returns the deepest accessibility child that should not be ignored.
@@ skipping 37 matching lines @@
     return [super hash];
   return browserAccessibility_->GetId();
 }
 
 - (BOOL)accessibilityShouldUseUniqueId {
   return YES;
 }
 
 @end