| Index: chrome/browser/ui/views/accessibility_event_router_views.cc
|
| ===================================================================
|
| --- chrome/browser/ui/views/accessibility_event_router_views.cc (revision 74117)
|
| +++ chrome/browser/ui/views/accessibility_event_router_views.cc (working copy)
|
| @@ -124,7 +124,7 @@
|
| view_tree_profile_map_.begin();
|
| iter != view_tree_profile_map_.end();
|
| ++iter) {
|
| - if (iter->first->IsParentOf(view)) {
|
| + if (iter->first->Contains(view)) {
|
| *is_accessible = true;
|
| if (profile)
|
| *profile = iter->second;
|
| @@ -232,10 +232,10 @@
|
| if (view->GetClassName() == views::MenuItemView::kViewClassName)
|
| has_submenu = static_cast<views::MenuItemView*>(view)->HasSubmenu();
|
|
|
| - views::View* parent_menu = view->GetParent();
|
| + views::View* parent_menu = view->parent();
|
| while (parent_menu != NULL && parent_menu->GetClassName() !=
|
| views::SubmenuView::kViewClassName) {
|
| - parent_menu = parent_menu->GetParent();
|
| + parent_menu = parent_menu->parent();
|
| }
|
| if (parent_menu) {
|
| count = 0;
|
| @@ -248,7 +248,7 @@
|
|
|
| void AccessibilityEventRouterViews::RecursiveGetMenuItemIndexAndCount(
|
| views::View* menu, views::View* item, int* index, int* count) {
|
| - for (int i = 0; i < menu->GetChildViewCount(); ++i) {
|
| + for (size_t i = 0; i < menu->child_count(); ++i) {
|
| views::View* child = menu->GetChildViewAt(i);
|
| int previous_count = *count;
|
| RecursiveGetMenuItemIndexAndCount(child, item, index, count);
|
| @@ -277,7 +277,7 @@
|
| role == AccessibilityTypes::ROLE_MENUPOPUP) {
|
| return true;
|
| }
|
| - view = view->GetParent();
|
| + view = view->parent();
|
| }
|
|
|
| return false;
|
|
|