Switch to standard integer types in ui/gfx/.

ui/gfx/color_utils.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/gfx/color_utils.h"
 
 #include <math.h>
-#if defined(OS_WIN)
-#include <windows.h>
-#endif
+#include <stdint.h>
 
 #include <algorithm>
 
-#include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
 #include "build/build_config.h"
-#if defined(OS_WIN)
-#include "skia/ext/skia_utils_win.h"
-#endif
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/color_palette.h"
 
+#if defined(OS_WIN)
+#include <windows.h>
+#include "skia/ext/skia_utils_win.h"
+#endif
+
 namespace color_utils {
 
 
 // Helper functions -----------------------------------------------------------
 
 namespace {
 
 int calcHue(double temp1, double temp2, double hue) {
   if (hue < 0.0)
     ++hue;
@@ skipping 94 matching lines @@
 }
 
 SkColor HSLToSkColor(const HSL& hsl, SkAlpha alpha) {
   double hue = hsl.h;
   double saturation = hsl.s;
   double lightness = hsl.l;
 
   // If there's no color, we don't care about hue and can do everything based on
   // brightness.
   if (!saturation) {
-    uint8 light;
+    uint8_t light;
 
     if (lightness < 0)
       light = 0;
     else if (lightness >= 1.0)
       light = 255;
     else
-      light = static_cast<uint8>(SkDoubleToFixed(lightness) >> 8);
+      light = static_cast<uint8_t>(SkDoubleToFixed(lightness) >> 8);
 
     return SkColorSetARGB(alpha, light, light, light);
   }
 
   double temp2 = (lightness < 0.5) ?
       (lightness * (1.0 + saturation)) :
       (lightness + saturation - (lightness * saturation));
   double temp1 = 2.0 * lightness - temp2;
   return SkColorSetARGB(alpha,
       calcHue(temp1, temp2, hue + 1.0 / 3.0),
@@ skipping 182 matching lines @@
   if (IsDark(text_color)) {
     // For black text, this comes out to kChromeIconGrey.
     return color_utils::AlphaBlend(SK_ColorWHITE, text_color,
                                    SkColorGetR(gfx::kChromeIconGrey));
   }
   // The dimming is less dramatic when darkening a light color.
   return color_utils::AlphaBlend(SK_ColorBLACK, text_color, 0x33);
 }
 
 }  // namespace color_utils