Index: content/browser/accessibility/browser_accessibility_cocoa.h |
diff --git a/content/browser/accessibility/browser_accessibility_cocoa.h b/content/browser/accessibility/browser_accessibility_cocoa.h |
index 479c362f7ef1beee7620abb2075a47910f10cb1c..8f38eaaa170c6fffb740a06f13056679149d5a30 100644 |
--- a/content/browser/accessibility/browser_accessibility_cocoa.h |
+++ b/content/browser/accessibility/browser_accessibility_cocoa.h |
@@ -9,7 +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 "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 |
@@ -19,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 |
@@ -41,6 +37,14 @@ |
// from browserAccessibility_. |
- (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; |