Switch to standard integer types in ui/.

ui/native_theme/native_theme_aura.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 "ui/native_theme/native_theme_aura.h"
 
 #include <limits>
 #include <utility>
 
 #include "base/logging.h"
+#include "build/build_config.h"
 #include "ui/base/layout.h"
 #include "ui/base/nine_image_painter_factory.h"
 #include "ui/base/resource/material_design/material_design_controller.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/nine_image_painter.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/skbitmap_operations.h"
@@ skipping 17 matching lines @@
   IMAGE_GRID(IDR_SCROLLBAR_THUMB_BASE_PRESSED)
 };
 
 const int kScrollbarArrowButtonImages[NativeTheme::kNumStates][9] = {
   EMPTY_IMAGE_GRID,
   IMAGE_GRID(IDR_SCROLLBAR_ARROW_BUTTON_BASE_HOVER),
   IMAGE_GRID(IDR_SCROLLBAR_ARROW_BUTTON_BASE_NORMAL),
   IMAGE_GRID(IDR_SCROLLBAR_ARROW_BUTTON_BASE_PRESSED)
 };
 
-const uint8 kScrollbarOverlayThumbFillAlphas[NativeTheme::kNumStates] = {
-  0,    // Does not matter, will not paint for disabled state.
-  178,  // Hover state, opacity 70%, alpha would be 0.7 * 255.
-  140,  // Normal state, opacity 55%, alpha would be 0.55 * 255.
-  178   // Pressed state, opacity 70%, alpha would be 0.7 * 255.
+const uint8_t kScrollbarOverlayThumbFillAlphas[NativeTheme::kNumStates] = {
+    0,    // Does not matter, will not paint for disabled state.
+    178,  // Hover state, opacity 70%, alpha would be 0.7 * 255.
+    140,  // Normal state, opacity 55%, alpha would be 0.55 * 255.
+    178   // Pressed state, opacity 70%, alpha would be 0.7 * 255.
 };
 
-const uint8 kScrollbarOverlayThumbStrokeAlphas[NativeTheme::kNumStates] = {
-  0,   // Does not matter, will not paint for disabled state.
-  51,  // Hover state, opacity 20%, alpha would be 0.2 * 255.
-  38,  // Normal state, opacity 15%, alpha would be 0.15 * 255.
-  51   // Pressed state, opacity 20%, alpha would be 0.2 * 255.
+const uint8_t kScrollbarOverlayThumbStrokeAlphas[NativeTheme::kNumStates] = {
+    0,   // Does not matter, will not paint for disabled state.
+    51,  // Hover state, opacity 20%, alpha would be 0.2 * 255.
+    38,  // Normal state, opacity 15%, alpha would be 0.15 * 255.
+    51   // Pressed state, opacity 20%, alpha would be 0.2 * 255.
 };
 
 const int kScrollbarOverlayThumbStrokeImages[9] =
     IMAGE_GRID_NO_CENTER(IDR_SCROLLBAR_OVERLAY_THUMB_STROKE);
 
 const int kScrollbarOverlayThumbFillImages[9] =
     IMAGE_GRID(IDR_SCROLLBAR_OVERLAY_THUMB_FILL);
 
 const int kScrollbarTrackImages[9] = IMAGE_GRID(IDR_SCROLLBAR_BASE);
 
@@ skipping 198 matching lines @@
 void NativeThemeAura::PaintPainter(NineImagePainter* painter,
                                    SkCanvas* sk_canvas,
                                    const gfx::Rect& rect) const {
   DCHECK(painter);
   scoped_ptr<gfx::Canvas> canvas(CommonThemeCreateCanvas(sk_canvas));
   painter->Paint(canvas.get(), rect);
 }
 
 scoped_ptr<NativeThemeAura::DualPainter> NativeThemeAura::CreateDualPainter(
     const int fill_image_ids[9],
-    const uint8 fill_alphas[kNumStates],
+    const uint8_t fill_alphas[kNumStates],
     const int stroke_image_ids[9],
-    const uint8 stroke_alphas[kNumStates]) const {
+    const uint8_t stroke_alphas[kNumStates]) const {
   scoped_ptr<NativeThemeAura::DualPainter> dual_painter(
       new NativeThemeAura::DualPainter(CreateNineImagePainter(fill_image_ids),
                                        fill_alphas,
                                        CreateNineImagePainter(stroke_image_ids),
                                        stroke_alphas));
   return dual_painter;
 }
 
 void NativeThemeAura::PaintDualPainter(
     NativeThemeAura::DualPainter* dual_painter,
@@ skipping 10 matching lines @@
 
 void NativeThemeAura::PaintDualPainterTransition(
     NativeThemeAura::DualPainter* dual_painter,
     SkCanvas* sk_canvas,
     const gfx::Rect& rect,
     State startState,
     State endState,
     double progress) const {
   DCHECK(dual_painter);
   scoped_ptr<gfx::Canvas> canvas(CommonThemeCreateCanvas(sk_canvas));
-  uint8 fill_alpha = dual_painter->fill_alphas[startState] +
-                     (dual_painter->fill_alphas[endState] -
-                      dual_painter->fill_alphas[startState]) *
-                         progress;
-  uint8 stroke_alpha = dual_painter->stroke_alphas[startState] +
-                       (dual_painter->stroke_alphas[endState] -
-                        dual_painter->stroke_alphas[startState]) *
+  uint8_t fill_alpha = dual_painter->fill_alphas[startState] +
+                       (dual_painter->fill_alphas[endState] -
+                        dual_painter->fill_alphas[startState]) *
                            progress;
+  uint8_t stroke_alpha = dual_painter->stroke_alphas[startState] +
+                         (dual_painter->stroke_alphas[endState] -
+                          dual_painter->stroke_alphas[startState]) *
+                             progress;
 
   dual_painter->fill_painter->Paint(canvas.get(), rect, fill_alpha);
   dual_painter->stroke_painter->Paint(canvas.get(), rect, stroke_alpha);
 }
 
 NativeThemeAura::DualPainter::DualPainter(
     scoped_ptr<NineImagePainter> fill_painter,
-    const uint8 fill_alphas[kNumStates],
+    const uint8_t fill_alphas[kNumStates],
     scoped_ptr<NineImagePainter> stroke_painter,
-    const uint8 stroke_alphas[kNumStates])
+    const uint8_t stroke_alphas[kNumStates])
     : fill_painter(std::move(fill_painter)),
       fill_alphas(fill_alphas),
       stroke_painter(std::move(stroke_painter)),
       stroke_alphas(stroke_alphas) {}
 
 NativeThemeAura::DualPainter::~DualPainter() {}
 
 }  // namespace ui