Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1116)

Unified Diff: ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc

Issue 1543173002: Switch to standard integer types in ui/views/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc
diff --git a/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc b/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc
index 5a76cbf7a46d40f643ddfd092cd7e9c5a9155bc5..3ef11e836033c70e2f30f5e5312dd5709628e47d 100644
--- a/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc
+++ b/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc
@@ -4,10 +4,13 @@
#include "ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h"
+#include <stddef.h>
+#include <stdint.h>
#include <X11/Xatom.h>
#include "base/event_types.h"
#include "base/lazy_instance.h"
+#include "base/macros.h"
#include "base/message_loop/message_loop.h"
#include "base/metrics/histogram_macros.h"
#include "third_party/skia/include/core/SkBitmap.h"
@@ -121,7 +124,7 @@ const int kRepeatMouseMoveTimeoutMs = 350;
// The minimum alpha before we declare a pixel transparent when searching in
// our source image.
-const uint32 kMinAlpha = 32;
+const uint32_t kMinAlpha = 32;
// |drag_widget_|'s opacity.
const unsigned char kDragWidgetOpacity = 0xc0;
@@ -1213,7 +1216,7 @@ bool DesktopDragDropClientAuraX11::IsValidDragImage(
const SkBitmap* in_bitmap = image.bitmap();
SkAutoLockPixels in_lock(*in_bitmap);
for (int y = 0; y < in_bitmap->height(); ++y) {
- uint32* in_row = in_bitmap->getAddr32(0, y);
+ uint32_t* in_row = in_bitmap->getAddr32(0, y);
for (int x = 0; x < in_bitmap->width(); ++x) {
if (SkColorGetA(in_row[x]) > kMinAlpha)

Powered by Google App Engine
This is Rietveld 408576698