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

Unified Diff: ash/wm/overview/window_grid.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/overview/window_grid.h ('k') | ash/wm/overview/window_selector.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/overview/window_grid.cc
diff --git a/ash/wm/overview/window_grid.cc b/ash/wm/overview/window_grid.cc
index 83ae20ac6b60fb52aa95a94d0cfe5b4e4d064e01..713c7cb235bd0195e5dd07d2eb9c871d801b0926 100644
--- a/ash/wm/overview/window_grid.cc
+++ b/ash/wm/overview/window_grid.cc
@@ -185,12 +185,14 @@ void ReorderItemsGreedyLeastMovement(std::vector<aura::Window*>* items,
bounding_rect.y() + row * item_size.height() + item_size.height() / 2);
// Find the nearest window for this position.
size_t swap_index = i;
- int64 shortest_distance = std::numeric_limits<int64>::max();
+ int64_t shortest_distance = std::numeric_limits<int64_t>::max();
for (size_t j = i; j < items->size(); ++j) {
aura::Window* window = (*items)[j];
- int64 distance = (ScreenUtil::ConvertRectToScreen(
- window, window->GetTargetBounds()).CenterPoint() -
- overview_item_center).LengthSquared();
+ int64_t distance =
+ (ScreenUtil::ConvertRectToScreen(window, window->GetTargetBounds())
+ .CenterPoint() -
+ overview_item_center)
+ .LengthSquared();
// We compare raw pointers to create a stable ordering given two windows
// with the same center point.
if (distance < shortest_distance ||
« no previous file with comments | « ash/wm/overview/window_grid.h ('k') | ash/wm/overview/window_selector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698