1 files changed, 16 insertions, 10 deletions
diff --git a/chromium/content/browser/accessibility/browser_accessibility_cocoa.h b/chromium/content/browser/accessibility/browser_accessibility_cocoa.h
index 9ac751fdb41..5fc708f867b 100644
--- a/chromium/content/browser/accessibility/browser_accessibility_cocoa.h
+++ b/chromium/content/browser/accessibility/browser_accessibility_cocoa.h
@@ -9,8 +9,7 @@
 
 #import "base/mac/scoped_nsobject.h"
 #include "content/browser/accessibility/browser_accessibility.h"
-#import "content/browser/accessibility/browser_accessibility_delegate_mac.h"
-#include "third_party/WebKit/public/web/WebAXEnums.h"
+#include "content/browser/accessibility/browser_accessibility_manager.h"
 
 // BrowserAccessibilityCocoa is a cocoa wrapper around the BrowserAccessibility
 // object. The renderer converts webkit's accessibility tree into a
@@ -20,15 +19,11 @@
  @private
   content::BrowserAccessibility* browserAccessibility_;
   base::scoped_nsobject<NSMutableArray> children_;
-  id<BrowserAccessibilityDelegateCocoa> delegate_;
 }
 
 // This creates a cocoa browser accessibility object around
-// the cross platform BrowserAccessibility object.  The delegate is
-// used to communicate with the host renderer.  None of these
-// parameters can be null.
-- (id)initWithObject:(content::BrowserAccessibility*)accessibility
-            delegate:(id<BrowserAccessibilityDelegateCocoa>)delegate;
+// the cross platform BrowserAccessibility object, which can't be null.
+- (id)initWithObject:(content::BrowserAccessibility*)accessibility;
 
 // Clear this object's pointer to the wrapped BrowserAccessibility object
 // because the wrapped object has been deleted, but this object may
@@ -40,11 +35,22 @@
 
 // Convenience method to get the internal, cross-platform role
 // from browserAccessibility_.
-- (blink::WebAXRole)internalRole;
+- (ui::AXRole)internalRole;
+
+// Convenience method to get the BrowserAccessibilityDelegate from
+// the manager.
+- (content::BrowserAccessibilityDelegate*)delegate;
+
+// Convert the local objet's origin to a global point.
+- (NSPoint)pointInScreen:(NSPoint)origin
+                    size:(NSSize)size;
 
 // Return the method name for the given attribute. For testing only.
 - (NSString*)methodNameForAttribute:(NSString*)attribute;
 
+// Swap the children array with the given scoped_nsobject.
+- (void)swapChildren:(base::scoped_nsobject<NSMutableArray>*)other;
+
 // Internally-used method.
 @property(nonatomic, readonly) NSPoint origin;
 
@@ -98,7 +104,7 @@
 @property(nonatomic, readonly) NSArray* tabs;
 @property(nonatomic, readonly) NSString* title;
 @property(nonatomic, readonly) id titleUIElement;
-@property(nonatomic, readonly) NSString* url;
+@property(nonatomic, readonly) NSURL* url;
 @property(nonatomic, readonly) NSString* value;
 @property(nonatomic, readonly) NSString* valueDescription;
 @property(nonatomic, readonly) NSValue* visibleCharacterRange;