Rename confusing child_id to unique_id_win

content/browser/accessibility/browser_accessibility.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.h"
 
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
@@ skipping 13 matching lines @@
 // and Win. For any other platform, instantiate the base class.
 // static
 BrowserAccessibility* BrowserAccessibility::Create() {
   return new BrowserAccessibility();
 }
 #endif
 
 BrowserAccessibility::BrowserAccessibility()
     : manager_(NULL),
       parent_(NULL),
-      child_id_(0),
       index_in_parent_(0),
       renderer_id_(0),
       role_(0),
       state_(0),
       instance_active_(false) {
 }
 
 BrowserAccessibility::~BrowserAccessibility() {
 }
 
 void BrowserAccessibility::DetachTree(
     std::vector<BrowserAccessibility*>* nodes) {
   nodes->push_back(this);
   for (size_t i = 0; i < children_.size(); i++)
     children_[i]->DetachTree(nodes);
   children_.clear();
   parent_ = NULL;
 }
 
 void BrowserAccessibility::InitializeTreeStructure(
     BrowserAccessibilityManager* manager,
     BrowserAccessibility* parent,
-    int32 child_id,
     int32 renderer_id,
     int32 index_in_parent) {
   manager_ = manager;
   parent_ = parent;
-  child_id_ = child_id;
   renderer_id_ = renderer_id;
   index_in_parent_ = index_in_parent;
 }
 
 void BrowserAccessibility::InitializeData(const AccessibilityNodeData& src) {
   DCHECK_EQ(renderer_id_, src.id);
   name_ = src.name;
   value_ = src.value;
   role_ = src.role;
   state_ = src.state;
@@ skipping 125 matching lines @@
 
   // Allow the object to fire a TextRemoved notification.
   name_.clear();
   value_.clear();
   PostInitialize();
 
   manager_->NotifyAccessibilityEvent(
       AccessibilityNotificationObjectHide, this);
 
   instance_active_ = false;
-  manager_->Remove(this);
+  manager_->RemoveNode(this);
   NativeReleaseReference();
 }
 
 void BrowserAccessibility::NativeReleaseReference() {
   delete this;
 }
 
 bool BrowserAccessibility::GetBoolAttribute(
     BoolAttribute attribute, bool* value) const {
   BoolAttrMap::const_iterator iter = bool_attributes_.find(attribute);
@@ skipping 96 matching lines @@
     return name_;
   }
 
   string16 result;
   for (size_t i = 0; i < children_.size(); ++i)
     result += children_[i]->GetTextRecursive();
   return result;
 }
 
 }  // namespace content