From 9c81217bffbc7aa8b5aad2054099d60407a1efb4 Mon Sep 17 00:00:00 2001 From: avi Date: Thu, 24 Dec 2015 15:40:05 -0800 Subject: Switch to standard integer types in ui/. BUG=138542 TBR=sky@chromium.org Review URL: https://codereview.chromium.org/1550483002 Cr-Commit-Position: refs/heads/master@{#366842} --- ui/snapshot/screenshot_grabber.cc | 2 ++ ui/snapshot/screenshot_grabber.h | 2 +- ui/snapshot/snapshot_async.h | 1 + ui/snapshot/snapshot_aura_unittest.cc | 8 ++++++-- 4 files changed, 10 insertions(+), 3 deletions(-) (limited to 'ui/snapshot') diff --git a/ui/snapshot/screenshot_grabber.cc b/ui/snapshot/screenshot_grabber.cc index e502060..7d44930 100644 --- a/ui/snapshot/screenshot_grabber.cc +++ b/ui/snapshot/screenshot_grabber.cc @@ -4,6 +4,8 @@ #include "ui/snapshot/screenshot_grabber.h" +#include + #include #include diff --git a/ui/snapshot/screenshot_grabber.h b/ui/snapshot/screenshot_grabber.h index 8461ce8..778168c 100644 --- a/ui/snapshot/screenshot_grabber.h +++ b/ui/snapshot/screenshot_grabber.h @@ -5,10 +5,10 @@ #ifndef UI_SNAPSHOT_SCREENSHOT_GRABBER_H_ #define UI_SNAPSHOT_SCREENSHOT_GRABBER_H_ -#include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" diff --git a/ui/snapshot/snapshot_async.h b/ui/snapshot/snapshot_async.h index 41da62b..467bdcb 100644 --- a/ui/snapshot/snapshot_async.h +++ b/ui/snapshot/snapshot_async.h @@ -5,6 +5,7 @@ #ifndef UI_SNAPSHOT_SNAPSHOT_ASYNC_H_ #define UI_SNAPSHOT_SNAPSHOT_ASYNC_H_ +#include "base/macros.h" #include "cc/output/copy_output_result.h" #include "ui/snapshot/snapshot.h" diff --git a/ui/snapshot/snapshot_aura_unittest.cc b/ui/snapshot/snapshot_aura_unittest.cc index 2279480..d360625 100644 --- a/ui/snapshot/snapshot_aura_unittest.cc +++ b/ui/snapshot/snapshot_aura_unittest.cc @@ -4,7 +4,11 @@ #include "ui/snapshot/snapshot.h" +#include +#include + #include "base/bind.h" +#include "base/macros.h" #include "base/test/test_simple_task_runner.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/aura/test/aura_test_helper.h" @@ -62,8 +66,8 @@ class TestPaintingWindowDelegate : public aura::test::TestWindowDelegate { size_t GetFailedPixelsCountWithScaleFactor(const gfx::Image& image, int scale_factor) { const SkBitmap* bitmap = image.ToSkBitmap(); - uint32* bitmap_data = reinterpret_cast( - bitmap->pixelRef()->pixels()); + uint32_t* bitmap_data = + reinterpret_cast(bitmap->pixelRef()->pixels()); size_t result = 0; for (int y = 0; y < bitmap->height(); y += scale_factor) { for (int x = 0; x < bitmap->width(); x += scale_factor) { -- cgit v1.1