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

Unified Diff: ash/wm/workspace/magnetism_matcher.cc

Issue 1540753002: Switch to standard integer types in ash/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: arraysize 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 | « ash/wm/workspace/magnetism_matcher.h ('k') | ash/wm/workspace/multi_window_resize_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace/magnetism_matcher.cc
diff --git a/ash/wm/workspace/magnetism_matcher.cc b/ash/wm/workspace/magnetism_matcher.cc
index d486f618de3ed1088afddc1050f374238e709252..18e20cbc994999b67b12b2897f9ef060b4a1ca57 100644
--- a/ash/wm/workspace/magnetism_matcher.cc
+++ b/ash/wm/workspace/magnetism_matcher.cc
@@ -20,7 +20,7 @@ bool IsCloseEnough(int a, int b) {
// MagnetismEdges.
bool CanMatchSecondaryEdge(MagnetismEdge primary,
SecondaryMagnetismEdge secondary,
- uint32 edges) {
+ uint32_t edges) {
// Convert |secondary| to a MagnetismEdge so we can compare it to |edges|.
MagnetismEdge secondary_as_magnetism_edge = MAGNETISM_EDGE_TOP;
switch (primary) {
@@ -120,7 +120,7 @@ void MagnetismEdgeMatcher::UpdateRanges(const Range& range) {
// static
const int MagnetismMatcher::kMagneticDistance = 8;
-MagnetismMatcher::MagnetismMatcher(const gfx::Rect& bounds, uint32 edges)
+MagnetismMatcher::MagnetismMatcher(const gfx::Rect& bounds, uint32_t edges)
: edges_(edges) {
if (edges & MAGNETISM_EDGE_TOP)
matchers_.push_back(new MagnetismEdgeMatcher(bounds, MAGNETISM_EDGE_TOP));
« no previous file with comments | « ash/wm/workspace/magnetism_matcher.h ('k') | ash/wm/workspace/multi_window_resize_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698