Refactor BrowserAccessibility to prepare for AXNode (re-land)

content/browser/accessibility/browser_accessibility_manager_win.cc

 // Copyright (c) 2012 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 "content/browser/accessibility/browser_accessibility_manager_win.h"
 
 #include "base/command_line.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/windows_version.h"
 #include "content/browser/accessibility/browser_accessibility_state_impl.h"
@@ skipping 66 matching lines @@
     DCHECK(accessible_hwnd_);
     parent_hwnd_ = accessible_hwnd_->hwnd();
     parent_iaccessible_ = accessible_hwnd_->window_accessible();
   }
   ::NotifyWinEvent(event, parent_hwnd(), OBJID_CLIENT, child_id);
 }
 
 void BrowserAccessibilityManagerWin::AddNodeToMap(BrowserAccessibility* node) {
   BrowserAccessibilityManager::AddNodeToMap(node);
   LONG unique_id_win = node->ToBrowserAccessibilityWin()->unique_id_win();
-  unique_id_to_renderer_id_map_[unique_id_win] = node->renderer_id();
+  unique_id_to_renderer_id_map_[unique_id_win] = node->GetId();
 }
 
 void BrowserAccessibilityManagerWin::RemoveNode(BrowserAccessibility* node) {
   unique_id_to_renderer_id_map_.erase(
       node->ToBrowserAccessibilityWin()->unique_id_win());
   BrowserAccessibilityManager::RemoveNode(node);
   if (node == tracked_scroll_object_) {
     tracked_scroll_object_->Release();
     tracked_scroll_object_ = NULL;
   }
 }
 
 void BrowserAccessibilityManagerWin::OnWindowFocused() {
   // Fire a focus event on the root first and then the focused node.
   if (focus_ != root_)
     NotifyAccessibilityEvent(ui::AX_EVENT_FOCUS, root_);
   BrowserAccessibilityManager::OnWindowFocused();
 }
 
 void BrowserAccessibilityManagerWin::OnWindowBlurred() {
   // Fire a blur event on the focused node first and then the root.
   BrowserAccessibilityManager::OnWindowBlurred();
   if (focus_ != root_)
     NotifyAccessibilityEvent(ui::AX_EVENT_BLUR, root_);
 }
 
 void BrowserAccessibilityManagerWin::NotifyAccessibilityEvent(
     ui::AXEvent event_type,
     BrowserAccessibility* node) {
-  if (node->role() == ui::AX_ROLE_INLINE_TEXT_BOX)
+  if (node->GetRole() == ui::AX_ROLE_INLINE_TEXT_BOX)
     return;
 
   LONG event_id = EVENT_MIN;
   switch (event_type) {
     case ui::AX_EVENT_ACTIVEDESCENDANTCHANGED:
       event_id = IA2_EVENT_ACTIVE_DESCENDANT_CHANGED;
       break;
     case ui::AX_EVENT_ALERT:
       event_id = EVENT_SYSTEM_ALERT;
       break;
@@ skipping 119 matching lines @@
   // |parent_iaccessible_| are no longer valid either, since they were
   // derived from AccessibleHWND. We don't have to restore them to
   // previous values, though, because this should only happen
   // during the destruct sequence for this window.
   accessible_hwnd_ = NULL;
   parent_hwnd_ = NULL;
   parent_iaccessible_ = NULL;
 }
 
 }  // namespace content