Rename confusing child_id to unique_id_win

content/browser/accessibility/browser_accessibility_manager.h

 // 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.
 
 #ifndef CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MANAGER_H_
 #define CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MANAGER_H_
 
 #include <vector>
 
 #include "base/hash_tables.h"
@@ skipping 50 matching lines @@
 
   virtual ~BrowserAccessibilityManager();
 
   // Type is enum AccessibilityNotification.
   // We pass it as int so that we don't include the message declaration
   // header here.
   virtual void NotifyAccessibilityEvent(
       int type,
       BrowserAccessibility* node) { }
 
-  // Returns the next unique child id.
-  static int32 GetNextChildID();
-
   // Return a pointer to the root of the tree, does not make a new reference.
   BrowserAccessibility* GetRoot();
 
   // Removes a node from the manager.
-  void Remove(BrowserAccessibility* node);
-
-  // Return a pointer to the object corresponding to the given child_id,
-  // does not make a new reference.
-  BrowserAccessibility* GetFromChildID(int32 child_id);
+  virtual void RemoveNode(BrowserAccessibility* node);
 
   // Return a pointer to the object corresponding to the given renderer_id,
   // does not make a new reference.
   BrowserAccessibility* GetFromRendererID(int32 renderer_id);
 
   // Called to notify the accessibility manager that its associated native
   // view got focused. This implies that it is shown (opposite of WasHidden,
   // below).
   // The touch_event_context parameter indicates that we were called in the
   // context of a touch event.
@@ skipping 63 matching lines @@
       const AccessibilityNodeData& node5 = AccessibilityNodeData(),
       const AccessibilityNodeData& node6 = AccessibilityNodeData(),
       const AccessibilityNodeData& node7 = AccessibilityNodeData());
 
  protected:
   BrowserAccessibilityManager(
       const AccessibilityNodeData& src,
       BrowserAccessibilityDelegate* delegate,
       BrowserAccessibilityFactory* factory);
 
+  virtual void AddNodeToMap(BrowserAccessibility* node);
+
  private:
   // The following states keep track of whether or not the
   // on-screen keyboard is allowed to be shown.
   enum OnScreenKeyboardState {
     // Never show the on-screen keyboard because this tab is hidden.
     OSK_DISALLOWED_BECAUSE_TAB_HIDDEN,
 
     // This tab was just shown, so don't pop-up the on-screen keyboard if a
     // text field gets focus that wasn't the result of an explicit touch.
     OSK_DISALLOWED_BECAUSE_TAB_JUST_APPEARED,
@@ skipping 17 matching lines @@
   // Update one node from the tree using data received from the renderer
   // process. Returns true on success, false on fatal error.
   bool UpdateNode(const AccessibilityNodeData& src);
 
   BrowserAccessibility* CreateNode(
       BrowserAccessibility* parent,
       int32 renderer_id,
       int32 index_in_parent);
 
  protected:
-  // The next unique id for a BrowserAccessibility instance.
-  static int32 next_child_id_;
-
   // The object that can perform actions on our behalf.
   BrowserAccessibilityDelegate* delegate_;
 
   // Factory to create BrowserAccessibility objects (for dependency injection).
   scoped_ptr<BrowserAccessibilityFactory> factory_;
 
   // The root of the tree of accessible objects and the element that
   // currently has focus, if any.
   BrowserAccessibility* root_;
   BrowserAccessibility* focus_;
 
   // The on-screen keyboard state.
   OnScreenKeyboardState osk_state_;
 
-  // A mapping from the IDs of objects in the renderer, to the child IDs
-  // we use internally here.
-  base::hash_map<int32, int32> renderer_id_to_child_id_map_;
-
-  // A mapping from child IDs to BrowserAccessibility objects.
-  base::hash_map<int32, BrowserAccessibility*> child_id_map_;
+  // A mapping from renderer IDs to BrowserAccessibility objects.
+  base::hash_map<int32, BrowserAccessibility*> renderer_id_map_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserAccessibilityManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MANAGER_H_