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

Side by Side Diff: ui/views/controls/table/table_header.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 4 years, 12 months 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/views/controls/table/table_header.h" 5 #include "ui/views/controls/table/table_header.h"
6 6
7 #include <stddef.h>
8
7 #include "third_party/skia/include/core/SkColor.h" 9 #include "third_party/skia/include/core/SkColor.h"
8 #include "third_party/skia/include/core/SkPaint.h" 10 #include "third_party/skia/include/core/SkPaint.h"
9 #include "third_party/skia/include/core/SkPath.h" 11 #include "third_party/skia/include/core/SkPath.h"
10 #include "ui/base/cursor/cursor.h" 12 #include "ui/base/cursor/cursor.h"
11 #include "ui/gfx/canvas.h" 13 #include "ui/gfx/canvas.h"
12 #include "ui/gfx/text_utils.h" 14 #include "ui/gfx/text_utils.h"
13 #include "ui/native_theme/native_theme.h" 15 #include "ui/native_theme/native_theme.h"
14 #include "ui/views/background.h" 16 #include "ui/views/background.h"
15 #include "ui/views/controls/table/table_utils.h" 17 #include "ui/views/controls/table/table_utils.h"
16 #include "ui/views/controls/table/table_view.h" 18 #include "ui/views/controls/table/table_view.h"
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 if (index > 0 && x >= column.x - kResizePadding && 279 if (index > 0 && x >= column.x - kResizePadding &&
278 x <= column.x + kResizePadding) { 280 x <= column.x + kResizePadding) {
279 return index - 1; 281 return index - 1;
280 } 282 }
281 const int max_x = column.x + column.width; 283 const int max_x = column.x + column.width;
282 return (x >= max_x - kResizePadding && x <= max_x + kResizePadding) ? 284 return (x >= max_x - kResizePadding && x <= max_x + kResizePadding) ?
283 index : -1; 285 index : -1;
284 } 286 }
285 287
286 } // namespace views 288 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698