Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(55)

Unified Diff: content/browser/accessibility/browser_accessibility_cocoa.mm

Issue 10379029: Revert 135593 - Add initial GTK web accessibility framework (new with valgrind fix). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/accessibility/browser_accessibility_cocoa.mm
===================================================================
--- content/browser/accessibility/browser_accessibility_cocoa.mm (revision 135594)
+++ content/browser/accessibility/browser_accessibility_cocoa.mm (working copy)
@@ -12,7 +12,6 @@
#include "base/string16.h"
#include "base/sys_string_conversions.h"
#include "base/utf_string_conversions.h"
-#include "content/browser/accessibility/browser_accessibility_mac.h"
#include "content/browser/accessibility/browser_accessibility_manager.h"
#include "content/public/common/content_client.h"
#include "grit/webkit_strings.h"
@@ -344,8 +343,7 @@
index < browserAccessibility_->child_count();
++index) {
BrowserAccessibilityCocoa* child =
- browserAccessibility_->GetChild(index)->
- ToBrowserAccessibilityMac()->native_view();
+ browserAccessibility_->GetChild(index)->toBrowserAccessibilityCocoa();
if ([child isIgnored])
[children_ addObjectsFromArray:[child children]];
else
@@ -364,7 +362,7 @@
// a DCHECK in the future.
if (child) {
BrowserAccessibilityCocoa* child_cocoa =
- child->ToBrowserAccessibilityMac()->native_view();
+ child->toBrowserAccessibilityCocoa();
[children_ addObject:child_cocoa];
}
}
@@ -375,9 +373,9 @@
- (void)childrenChanged {
if (![self isIgnored]) {
children_.reset();
- } else if (browserAccessibility_->parent()) {
- [browserAccessibility_->parent()->ToBrowserAccessibilityMac()->native_view()
- childrenChanged];
+ } else {
+ [browserAccessibility_->parent()->toBrowserAccessibilityCocoa()
+ childrenChanged];
}
}
@@ -490,8 +488,7 @@
// A nil parent means we're the root.
if (browserAccessibility_->parent()) {
return NSAccessibilityUnignoredAncestor(
- browserAccessibility_->parent()->ToBrowserAccessibilityMac()->
- native_view());
+ browserAccessibility_->parent()->toBrowserAccessibilityCocoa());
} else {
// Hook back up to RenderWidgetHostViewCocoa.
return browserAccessibility_->manager()->GetParentView();
@@ -635,7 +632,7 @@
BrowserAccessibility* titleElement =
browserAccessibility_->manager()->GetFromRendererID(titleElementId);
if (titleElement)
- return titleElement->ToBrowserAccessibilityMac()->native_view();
+ return titleElement->toBrowserAccessibilityCocoa();
}
return nil;
}
« no previous file with comments | « content/browser/accessibility/browser_accessibility.cc ('k') | content/browser/accessibility/browser_accessibility_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698