Rework tree APIs to reflect Google style and more const-correctness....

chrome/browser/ui/views/accessibility_event_router_views.cc

 // Copyright (c) 2011 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 "chrome/browser/ui/views/accessibility_event_router_views.h"
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
@@ skipping 106 matching lines @@
 
 void AccessibilityEventRouterViews::FindView(
     views::View* view, Profile** profile, bool* is_accessible) {
   *is_accessible = false;
 
   // First see if it's a descendant of an accessible view.
   for (base::hash_map<views::View*, Profile*>::const_iterator iter =
            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;
       break;
     }
   }
 
   if (!*is_accessible)
     return;
 
@@ skipping 87 matching lines @@
     views::View* view, NotificationType type, Profile* profile) {
   std::string name = GetViewName(view);
 
   bool has_submenu = false;
   int index = -1;
   int count = -1;
 
   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;
     RecursiveGetMenuItemIndexAndCount(parent_menu, view, &index, &count);
   }
 
   AccessibilityMenuItemInfo info(profile, name, has_submenu, index, count);
   SendAccessibilityNotification(type, &info);
 }
 
 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);
     if (child->GetClassName() == views::MenuItemView::kViewClassName &&
         *count == previous_count) {
       if (item == child)
         *index = *count;
       (*count)++;
     } else if (child->GetClassName() == views::TextButton::kViewClassName) {
       if (item == child)
         *index = *count;
       (*count)++;
     }
   }
 }
 
 bool AccessibilityEventRouterViews::IsMenuEvent(
     views::View* view, NotificationType type) {
   if (type == NotificationType::ACCESSIBILITY_MENU_OPENED ||
       type == NotificationType::ACCESSIBILITY_MENU_CLOSED)
     return true;
 
   while (view) {
     AccessibilityTypes::Role role = view->GetAccessibleRole();
     if (role == AccessibilityTypes::ROLE_MENUITEM ||
         role == AccessibilityTypes::ROLE_MENUPOPUP) {
       return true;
     }
-    view = view->GetParent();
+    view = view->parent();
   }
 
   return false;
 }
 
 void AccessibilityEventRouterViews::SendLocationBarNotification(
     views::View* view, NotificationType type, Profile* profile) {
 #if defined(OS_WIN)
   // This particular method isn't needed on Linux/Views, we get text
   // notifications directly from GTK.
   std::string name = GetViewName(view);
   LocationBarView* location_bar = static_cast<LocationBarView*>(view);
   AutocompleteEditViewWin* location_entry =
       static_cast<AutocompleteEditViewWin*>(location_bar->location_entry());
 
   std::string value = WideToUTF8(location_entry->GetText());
   std::wstring::size_type selection_start;
   std::wstring::size_type selection_end;
   location_entry->GetSelectionBounds(&selection_start, &selection_end);
 
   AccessibilityTextBoxInfo info(profile, name, false);
   info.SetValue(value, selection_start, selection_end);
   SendAccessibilityNotification(type, &info);
 #endif
 }