Switch to standard integer types in ui/.

ui/accessibility/ax_tree.h

 // Copyright 2013 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 UI_ACCESSIBILITY_AX_TREE_H_
 #define UI_ACCESSIBILITY_AX_TREE_H_
 
+#include <stdint.h>
+
 #include <set>
 
 #include "base/containers/hash_tables.h"
 #include "ui/accessibility/ax_export.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/accessibility/ax_tree_data.h"
 #include "ui/accessibility/ax_tree_update.h"
 
 namespace ui {
 
@@ skipping 78 matching lines @@
   explicit AXTree(const AXTreeUpdate& initial_state);
   virtual ~AXTree();
 
   virtual void SetDelegate(AXTreeDelegate* delegate);
 
   AXNode* root() const { return root_; }
 
   const AXTreeData& data() const { return data_; }
 
   // Returns the AXNode with the given |id| if it is part of this AXTree.
-  AXNode* GetFromId(int32 id) const;
+  AXNode* GetFromId(int32_t id) const;
 
   // Returns true on success. If it returns false, it's a fatal error
   // and this tree should be destroyed, and the source of the tree update
   // should not be trusted any longer.
   virtual bool Unserialize(const AXTreeUpdate& update);
 
   virtual void UpdateData(const AXTreeData& data);
 
   // Return a multi-line indented string representation, for logging.
   std::string ToString() const;
 
   // A string describing the error from an unsuccessful Unserialize,
   // for testing and debugging.
   const std::string& error() const { return error_; }
 
   int size() { return static_cast<int>(id_map_.size()); }
 
  private:
-  AXNode* CreateNode(AXNode* parent, int32 id, int32 index_in_parent);
+  AXNode* CreateNode(AXNode* parent, int32_t id, int32_t index_in_parent);
 
   // This is called from within Unserialize(), it returns true on success.
   bool UpdateNode(const AXNodeData& src, AXTreeUpdateState* update_state);
 
   void OnRootChanged();
 
   // Notify the delegate that the subtree rooted at |node| will be destroyed,
   // then call DestroyNodeAndSubtree on it.
   void DestroySubtree(AXNode* node, AXTreeUpdateState* update_state);
 
   // Call Destroy() on |node|, and delete it from the id map, and then
   // call recursively on all nodes in its subtree.
   void DestroyNodeAndSubtree(AXNode* node, AXTreeUpdateState* update_state);
 
   // Iterate over the children of |node| and for each child, destroy the
   // child and its subtree if its id is not in |new_child_ids|. Returns
   // true on success, false on fatal error.
   bool DeleteOldChildren(AXNode* node,
-                         const std::vector<int32>& new_child_ids,
+                         const std::vector<int32_t>& new_child_ids,
                          AXTreeUpdateState* update_state);
 
   // Iterate over |new_child_ids| and populate |new_children| with
   // pointers to child nodes, reusing existing nodes already in the tree
   // if they exist, and creating otherwise. Reparenting is disallowed, so
   // if the id already exists as the child of another node, that's an
   // error. Returns true on success, false on fatal error.
   bool CreateNewChildVector(AXNode* node,
-                            const std::vector<int32>& new_child_ids,
+                            const std::vector<int32_t>& new_child_ids,
                             std::vector<AXNode*>* new_children,
                             AXTreeUpdateState* update_state);
 
   AXTreeDelegate* delegate_;
   AXNode* root_;
-  base::hash_map<int32, AXNode*> id_map_;
+  base::hash_map<int32_t, AXNode*> id_map_;
   std::string error_;
   AXTreeData data_;
 };
 
 }  // namespace ui
 
 #endif  // UI_ACCESSIBILITY_AX_TREE_H_