Switch to standard integer types in content/browser/.

content/browser/accessibility/browser_accessibility_android.cc

 // 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.
 
 #include "content/browser/accessibility/browser_accessibility_android.h"
 
 #include "base/i18n/break_iterator.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 354 matching lines @@
   }
 
   if (text.empty())
     text = value;
 
   // This is called from PlatformIsLeaf, so don't call PlatformChildCount
   // from within this!
   if (text.empty() &&
       (HasOnlyStaticTextChildren() ||
        (IsFocusable() && HasOnlyTextAndImageChildren()))) {
-    for (uint32 i = 0; i < InternalChildCount(); i++) {
+    for (uint32_t i = 0; i < InternalChildCount(); i++) {
       BrowserAccessibility* child = InternalGetChild(i);
       text += static_cast<BrowserAccessibilityAndroid*>(child)->GetText();
     }
   }
 
   if (text.empty() && (IsLink() || GetRole() == ui::AX_ROLE_IMAGE)) {
     base::string16 url = GetString16Attribute(ui::AX_ATTR_URL);
     // Given a url like http://foo.com/bar/baz.png, just return the
     // base text, e.g., "baz".
     int trailing_slashes = 0;
@@ skipping 379 matching lines @@
 float BrowserAccessibilityAndroid::RangeMax() const {
   return GetFloatAttribute(ui::AX_ATTR_MAX_VALUE_FOR_RANGE);
 }
 
 float BrowserAccessibilityAndroid::RangeCurrentValue() const {
   return GetFloatAttribute(ui::AX_ATTR_VALUE_FOR_RANGE);
 }
 
 void BrowserAccessibilityAndroid::GetGranularityBoundaries(
     int granularity,
-    std::vector<int32>* starts,
-    std::vector<int32>* ends,
+    std::vector<int32_t>* starts,
+    std::vector<int32_t>* ends,
     int offset) {
   switch (granularity) {
     case ANDROID_ACCESSIBILITY_NODE_INFO_MOVEMENT_GRANULARITY_LINE:
       GetLineBoundaries(starts, ends, offset);
       break;
     case ANDROID_ACCESSIBILITY_NODE_INFO_MOVEMENT_GRANULARITY_WORD:
       GetWordBoundaries(starts, ends, offset);
       break;
     default:
       NOTREACHED();
   }
 }
 
 void BrowserAccessibilityAndroid::GetLineBoundaries(
-    std::vector<int32>* line_starts,
-    std::vector<int32>* line_ends,
+    std::vector<int32_t>* line_starts,
+    std::vector<int32_t>* line_ends,
     int offset) {
   // If this node has no children, treat it as all one line.
   if (GetText().size() > 0 && !InternalChildCount()) {
     line_starts->push_back(offset);
     line_ends->push_back(offset + GetText().size());
   }
 
   // If this is a static text node, get the line boundaries from the
   // inline text boxes if possible.
   if (GetRole() == ui::AX_ROLE_STATIC_TEXT) {
     int last_y = 0;
-    for (uint32 i = 0; i < InternalChildCount(); i++) {
+    for (uint32_t i = 0; i < InternalChildCount(); i++) {
       BrowserAccessibilityAndroid* child =
           static_cast<BrowserAccessibilityAndroid*>(InternalGetChild(i));
       CHECK_EQ(ui::AX_ROLE_INLINE_TEXT_BOX, child->GetRole());
       // TODO(dmazzoni): replace this with a proper API to determine
       // if two inline text boxes are on the same line. http://crbug.com/421771
       int y = child->GetLocation().y();
       if (i == 0) {
         line_starts->push_back(offset);
       } else if (y != last_y) {
         line_ends->push_back(offset);
         line_starts->push_back(offset);
       }
       offset += child->GetText().size();
       last_y = y;
     }
     line_ends->push_back(offset);
     return;
   }
 
   // Otherwise, call GetLineBoundaries recursively on the children.
-  for (uint32 i = 0; i < InternalChildCount(); i++) {
+  for (uint32_t i = 0; i < InternalChildCount(); i++) {
     BrowserAccessibilityAndroid* child =
         static_cast<BrowserAccessibilityAndroid*>(InternalGetChild(i));
     child->GetLineBoundaries(line_starts, line_ends, offset);
     offset += child->GetText().size();
   }
 }
 
 void BrowserAccessibilityAndroid::GetWordBoundaries(
-    std::vector<int32>* word_starts,
-    std::vector<int32>* word_ends,
+    std::vector<int32_t>* word_starts,
+    std::vector<int32_t>* word_ends,
     int offset) {
   if (GetRole() == ui::AX_ROLE_INLINE_TEXT_BOX) {
-    const std::vector<int32>& starts = GetIntListAttribute(
-        ui::AX_ATTR_WORD_STARTS);
-    const std::vector<int32>& ends = GetIntListAttribute(
-        ui::AX_ATTR_WORD_ENDS);
+    const std::vector<int32_t>& starts =
+        GetIntListAttribute(ui::AX_ATTR_WORD_STARTS);
+    const std::vector<int32_t>& ends =
+        GetIntListAttribute(ui::AX_ATTR_WORD_ENDS);
     for (size_t i = 0; i < starts.size(); ++i) {
       word_starts->push_back(offset + starts[i]);
       word_ends->push_back(offset + ends[i]);
     }
     return;
   }
 
   base::string16 concatenated_text;
-  for (uint32 i = 0; i < InternalChildCount(); i++) {
+  for (uint32_t i = 0; i < InternalChildCount(); i++) {
     BrowserAccessibilityAndroid* child =
         static_cast<BrowserAccessibilityAndroid*>(InternalGetChild(i));
     base::string16 child_text = child->GetText();
     concatenated_text += child->GetText();
   }
 
   base::string16 text = GetText();
   if (text.empty() || concatenated_text == text) {
     // Great - this node is just the concatenation of its children, so
     // we can get the word boundaries recursively.
-    for (uint32 i = 0; i < InternalChildCount(); i++) {
+    for (uint32_t i = 0; i < InternalChildCount(); i++) {
       BrowserAccessibilityAndroid* child =
           static_cast<BrowserAccessibilityAndroid*>(InternalGetChild(i));
       child->GetWordBoundaries(word_starts, word_ends, offset);
       offset += child->GetText().size();
     }
   } else {
     // This node has its own accessible text that doesn't match its
     // visible text - like alt text for an image or something with an
     // aria-label, so split the text into words locally.
     base::i18n::BreakIterator iter(text, base::i18n::BreakIterator::BREAK_WORD);
     if (!iter.Init())
       return;
     while (iter.Advance()) {
       if (iter.IsWord()) {
         word_starts->push_back(iter.prev());
         word_ends->push_back(iter.pos());
       }
     }
   }
 }
 
 bool BrowserAccessibilityAndroid::HasFocusableChild() const {
   // This is called from PlatformIsLeaf, so don't call PlatformChildCount
   // from within this!
-  for (uint32 i = 0; i < InternalChildCount(); i++) {
+  for (uint32_t i = 0; i < InternalChildCount(); i++) {
     BrowserAccessibility* child = InternalGetChild(i);
     if (child->HasState(ui::AX_STATE_FOCUSABLE))
       return true;
     if (static_cast<BrowserAccessibilityAndroid*>(child)->HasFocusableChild())
       return true;
   }
   return false;
 }
 
 bool BrowserAccessibilityAndroid::HasOnlyStaticTextChildren() const {
   // This is called from PlatformIsLeaf, so don't call PlatformChildCount
   // from within this!
-  for (uint32 i = 0; i < InternalChildCount(); i++) {
+  for (uint32_t i = 0; i < InternalChildCount(); i++) {
     BrowserAccessibility* child = InternalGetChild(i);
     if (child->GetRole() != ui::AX_ROLE_STATIC_TEXT)
       return false;
   }
   return true;
 }
 
 bool BrowserAccessibilityAndroid::HasOnlyTextAndImageChildren() const {
   // This is called from PlatformIsLeaf, so don't call PlatformChildCount
   // from within this!
-  for (uint32 i = 0; i < InternalChildCount(); i++) {
+  for (uint32_t i = 0; i < InternalChildCount(); i++) {
     BrowserAccessibility* child = InternalGetChild(i);
     if (child->GetRole() != ui::AX_ROLE_STATIC_TEXT &&
         child->GetRole() != ui::AX_ROLE_IMAGE) {
       return false;
     }
   }
   return true;
 }
 
 bool BrowserAccessibilityAndroid::IsIframe() const {
@@ skipping 36 matching lines @@
     if (!text.empty()) {
       manager()->NotifyAccessibilityEvent(ui::AX_EVENT_SHOW,
                                          this);
     }
     cached_text_ = text;
   }
 }
 
 int BrowserAccessibilityAndroid::CountChildrenWithRole(ui::AXRole role) const {
   int count = 0;
-  for (uint32 i = 0; i < PlatformChildCount(); i++) {
+  for (uint32_t i = 0; i < PlatformChildCount(); i++) {
     if (PlatformGetChild(i)->GetRole() == role)
       count++;
   }
   return count;
 }
 
 }  // namespace content