Rename confusing child_id to unique_id_win

content/browser/accessibility/browser_accessibility.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_H_
 #define CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_H_
 
 #include <map>
 #include <utility>
 #include <vector>
@@ skipping 52 matching lines @@
   virtual void PostInitialize() {}
 
   // Returns true if this is a native platform-specific object, vs a
   // cross-platform generic object.
   virtual bool IsNative() const;
 
   // Initialize the tree structure of this object.
   void InitializeTreeStructure(
       BrowserAccessibilityManager* manager,
       BrowserAccessibility* parent,
-      int32 child_id,
       int32 renderer_id,
       int32 index_in_parent);
 
   // Initialize this object's data.
   void InitializeData(const AccessibilityNodeData& src);
 
   virtual void SwapChildren(std::vector<BrowserAccessibility*>& children);
 
   // Update the parent and index in parent if this node has been moved.
   void UpdateParent(BrowserAccessibility* parent, int index_in_parent);
@@ skipping 59 matching lines @@
   }
 
   const IntAttrMap& int_attributes() const {
     return int_attributes_;
   }
 
   const StringAttrMap& string_attributes() const {
     return string_attributes_;
   }
 
-  int32 child_id() const { return child_id_; }
   const std::vector<BrowserAccessibility*>& children() const {
     return children_;
   }
   const std::vector<std::pair<string16, string16> >& html_attributes() const {
     return html_attributes_;
   }
   int32 index_in_parent() const { return index_in_parent_; }
   const std::vector<int32>& indirect_child_ids() const {
     return indirect_child_ids_;
   }
@@ skipping 82 matching lines @@
 
   BrowserAccessibility();
 
   // The manager of this tree of accessibility objects; needed for
   // global operations like focus tracking.
   BrowserAccessibilityManager* manager_;
 
   // The parent of this object, may be NULL if we're the root object.
   BrowserAccessibility* parent_;
 
-  // The ID of this object; globally unique within the browser process.
-  int32 child_id_;
-
   // The index of this within its parent object.
   int32 index_in_parent_;
 
   // The ID of this object in the renderer process.
   int32 renderer_id_;
 
   // The children of this object.
   std::vector<BrowserAccessibility*> children_;
 
   // Accessibility metadata from the renderer
@@ skipping 20 matching lines @@
   // immediately return failure.
   bool instance_active_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BrowserAccessibility);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_H_