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

Unified Diff: ui/native_theme/native_theme_aura.h

Issue 1550483002: Switch to standard integer types in ui/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@int-ui-events
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
« no previous file with comments | « ui/native_theme/native_theme_android.cc ('k') | ui/native_theme/native_theme_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/native_theme/native_theme_aura.h
diff --git a/ui/native_theme/native_theme_aura.h b/ui/native_theme/native_theme_aura.h
index dde0a8abd59106cacbcbec84d5058f75aab767dd..8482131ffc38831874083cd0e247d4e0961f0987 100644
--- a/ui/native_theme/native_theme_aura.h
+++ b/ui/native_theme/native_theme_aura.h
@@ -5,8 +5,10 @@
#ifndef UI_NATIVE_THEME_NATIVE_THEME_AURA_H_
#define UI_NATIVE_THEME_NATIVE_THEME_AURA_H_
-#include "base/basictypes.h"
+#include <stdint.h>
+
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "ui/native_theme/native_theme_base.h"
namespace gfx {
@@ -87,23 +89,23 @@ class NATIVE_THEME_EXPORT NativeThemeAura : public NativeThemeBase {
// value associated with each state, so that a DualPainter for overlay
// scrollbar thumb would only need state as input to paint correctly.
DualPainter(scoped_ptr<gfx::NineImagePainter> fill_painter,
- const uint8 fill_alphas[kNumStates],
+ const uint8_t fill_alphas[kNumStates],
scoped_ptr<gfx::NineImagePainter> stroke_painter,
- const uint8 stroke_alphas[kNumStates]);
+ const uint8_t stroke_alphas[kNumStates]);
~DualPainter();
scoped_ptr<gfx::NineImagePainter> fill_painter;
- const uint8* const fill_alphas;
+ const uint8_t* const fill_alphas;
scoped_ptr<gfx::NineImagePainter> stroke_painter;
- const uint8* const stroke_alphas;
+ const uint8_t* const stroke_alphas;
};
// Returns DualPainter from specific fill and stroke, creating if necessary.
scoped_ptr<DualPainter> 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;
// Paints |dualPainter| into the canvas using |rect| and specific alpha.
void PaintDualPainter(DualPainter* dual_painter,
« no previous file with comments | « ui/native_theme/native_theme_android.cc ('k') | ui/native_theme/native_theme_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698