Switch to standard integer types in ash/.

ash/system/tray_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 "ash/system/tray_accessibility.h"
 
 #include "ash/accessibility_delegate.h"
 #include "ash/metrics/user_metrics_recorder.h"
 #include "ash/session/session_state_delegate.h"
 #include "ash/shell.h"
@@ skipping 23 matching lines @@
   A11Y_NONE = 0,
   A11Y_SPOKEN_FEEDBACK = 1 << 0,
   A11Y_HIGH_CONTRAST = 1 << 1,
   A11Y_SCREEN_MAGNIFIER = 1 << 2,
   A11Y_LARGE_CURSOR = 1 << 3,
   A11Y_AUTOCLICK = 1 << 4,
   A11Y_VIRTUAL_KEYBOARD = 1 << 5,
   A11Y_BRAILLE_DISPLAY_CONNECTED = 1 << 6,
 };
 
-uint32 GetAccessibilityState() {
+uint32_t GetAccessibilityState() {
   AccessibilityDelegate* delegate =
       Shell::GetInstance()->accessibility_delegate();
-  uint32 state = A11Y_NONE;
+  uint32_t state = A11Y_NONE;
   if (delegate->IsSpokenFeedbackEnabled())
     state |= A11Y_SPOKEN_FEEDBACK;
   if (delegate->IsHighContrastEnabled())
     state |= A11Y_HIGH_CONTRAST;
   if (delegate->IsMagnifierEnabled())
     state |= A11Y_SCREEN_MAGNIFIER;
   if (delegate->IsLargeCursorEnabled())
     state |= A11Y_LARGE_CURSOR;
   if (delegate->IsAutoclickEnabled())
     state |= A11Y_AUTOCLICK;
@@ skipping 29 matching lines @@
   ~DefaultAccessibilityView() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DefaultAccessibilityView);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // ash::tray::AccessibilityPopupView
 
 AccessibilityPopupView::AccessibilityPopupView(SystemTrayItem* owner,
-                                               uint32 enabled_state_bits)
+                                               uint32_t enabled_state_bits)
     : TrayNotificationView(owner, IDR_AURA_UBER_TRAY_ACCESSIBILITY_DARK),
       label_(CreateLabel(enabled_state_bits)) {
   InitView(label_);
 }
 
-views::Label* AccessibilityPopupView::CreateLabel(uint32 enabled_state_bits) {
+views::Label* AccessibilityPopupView::CreateLabel(uint32_t enabled_state_bits) {
   DCHECK((enabled_state_bits &
           (A11Y_SPOKEN_FEEDBACK | A11Y_BRAILLE_DISPLAY_CONNECTED)) != 0);
   base::string16 text;
   if (enabled_state_bits & A11Y_BRAILLE_DISPLAY_CONNECTED) {
     text.append(l10n_util::GetStringUTF16(
         IDS_ASH_STATUS_TRAY_BRAILLE_DISPLAY_CONNECTED_BUBBLE));
   }
   if (enabled_state_bits & A11Y_SPOKEN_FEEDBACK) {
     if (!text.empty())
       text.append(base::ASCIIToUTF16(" "));
@@ skipping 282 matching lines @@
     show_a11y_menu_on_lock_screen_ = (GetAccessibilityState() != A11Y_NONE);
 
   login_ = status;
   SetTrayIconVisible(GetInitialVisibility());
 }
 
 void TrayAccessibility::OnAccessibilityModeChanged(
     ui::AccessibilityNotificationVisibility notify) {
   SetTrayIconVisible(GetInitialVisibility());
 
-  uint32 accessibility_state = GetAccessibilityState();
+  uint32_t accessibility_state = GetAccessibilityState();
   // We'll get an extra notification if a braille display is connected when
   // spoken feedback wasn't already enabled.  This is because the braille
   // connection state is already updated when spoken feedback is enabled so
   // that the notifications can be consolidated into one.  Therefore, we
   // return early if there's no change in the state that we keep track of.
   if (accessibility_state == previous_accessibility_state_)
     return;
   // Contains bits for spoken feedback and braille display connected currently
   // being enabled.
-  uint32 being_enabled =
+  uint32_t being_enabled =
       (accessibility_state & ~previous_accessibility_state_) &
       (A11Y_SPOKEN_FEEDBACK | A11Y_BRAILLE_DISPLAY_CONNECTED);
   if ((notify == ui::A11Y_NOTIFICATION_SHOW) && being_enabled != A11Y_NONE) {
     // Shows popup if |notify| is true and the spoken feedback is being enabled.
     request_popup_view_state_ = being_enabled;
     PopupDetailedView(kTrayPopupAutoCloseDelayForTextInSeconds, false);
   } else {
     if (detailed_popup_)
       detailed_popup_->GetWidget()->Close();
     if (detailed_menu_)
       detailed_menu_->GetWidget()->Close();
   }
 
   previous_accessibility_state_ = accessibility_state;
 }
 
 }  // namespace ash