| Index: content/browser/accessibility/browser_accessibility.h
|
| diff --git a/content/browser/accessibility/browser_accessibility.h b/content/browser/accessibility/browser_accessibility.h
|
| index d24c7d3f9a5098427e2e7ea833472fb2b092d43a..72f5cd5c041e5d8f288c809c2500ca627deabc2e 100644
|
| --- a/content/browser/accessibility/browser_accessibility.h
|
| +++ b/content/browser/accessibility/browser_accessibility.h
|
| @@ -5,11 +5,13 @@
|
| #ifndef CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_H_
|
| #define CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_H_
|
|
|
| +#include <stdint.h>
|
| +
|
| #include <map>
|
| #include <utility>
|
| #include <vector>
|
|
|
| -#include "base/basictypes.h"
|
| +#include "base/macros.h"
|
| #include "base/strings/string16.h"
|
| #include "base/strings/string_split.h"
|
| #include "build/build_config.h"
|
| @@ -103,11 +105,11 @@ class CONTENT_EXPORT BrowserAccessibility {
|
|
|
| // Returns the number of children of this object, or 0 if PlatformIsLeaf()
|
| // returns true.
|
| - uint32 PlatformChildCount() const;
|
| + uint32_t PlatformChildCount() const;
|
|
|
| // Return a pointer to the child at the given index, or NULL for an
|
| // invalid index. Returns NULL if PlatformIsLeaf() returns true.
|
| - BrowserAccessibility* PlatformGetChild(uint32 child_index) const;
|
| + BrowserAccessibility* PlatformGetChild(uint32_t child_index) const;
|
|
|
| // Returns true if an ancestor of this node (not including itself) is a
|
| // leaf node, meaning that this node is not actually exposed to the
|
| @@ -188,18 +190,18 @@ class CONTENT_EXPORT BrowserAccessibility {
|
| // reflect the accessibility tree that should be exposed on each platform.
|
| // Use PlatformChildCount and PlatformGetChild to implement platform
|
| // accessibility APIs.
|
| - uint32 InternalChildCount() const;
|
| - BrowserAccessibility* InternalGetChild(uint32 child_index) const;
|
| + uint32_t InternalChildCount() const;
|
| + BrowserAccessibility* InternalGetChild(uint32_t child_index) const;
|
| BrowserAccessibility* InternalGetParent() const;
|
|
|
| BrowserAccessibility* GetParent() const;
|
| - int32 GetIndexInParent() const;
|
| + int32_t GetIndexInParent() const;
|
|
|
| - int32 GetId() const;
|
| + int32_t GetId() const;
|
| const ui::AXNodeData& GetData() const;
|
| gfx::Rect GetLocation() const;
|
| - int32 GetRole() const;
|
| - int32 GetState() const;
|
| + int32_t GetRole() const;
|
| + int32_t GetState() const;
|
|
|
| typedef base::StringPairs HtmlAttributes;
|
| const HtmlAttributes& GetHtmlAttributes() const;
|
| @@ -259,10 +261,10 @@ class CONTENT_EXPORT BrowserAccessibility {
|
| ui::AXStringAttribute attribute) const;
|
|
|
| bool HasIntListAttribute(ui::AXIntListAttribute attribute) const;
|
| - const std::vector<int32>& GetIntListAttribute(
|
| + const std::vector<int32_t>& GetIntListAttribute(
|
| ui::AXIntListAttribute attribute) const;
|
| bool GetIntListAttribute(ui::AXIntListAttribute attribute,
|
| - std::vector<int32>* value) const;
|
| + std::vector<int32_t>* value) const;
|
|
|
| // Retrieve the value of a html attribute from the attribute map and
|
| // returns true if found.
|
|
|