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

Side by Side Diff: ui/views/controls/scroll_view.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/scroll_view.h" 5 #include "ui/views/controls/scroll_view.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/macros.h"
8 #include "ui/events/event.h" 9 #include "ui/events/event.h"
9 #include "ui/gfx/canvas.h" 10 #include "ui/gfx/canvas.h"
10 #include "ui/native_theme/native_theme.h" 11 #include "ui/native_theme/native_theme.h"
11 #include "ui/views/border.h" 12 #include "ui/views/border.h"
12 #include "ui/views/controls/scrollbar/native_scroll_bar.h" 13 #include "ui/views/controls/scrollbar/native_scroll_bar.h"
13 #include "ui/views/widget/root_view.h" 14 #include "ui/views/widget/root_view.h"
14 15
15 namespace views { 16 namespace views {
16 17
17 const char ScrollView::kViewClassName[] = "ScrollView"; 18 const char ScrollView::kViewClassName[] = "ScrollView";
(...skipping 615 matching lines...) Expand 10 before | Expand all | Expand 10 after
633 634
634 VariableRowHeightScrollHelper::RowInfo 635 VariableRowHeightScrollHelper::RowInfo
635 FixedRowHeightScrollHelper::GetRowInfo(int y) { 636 FixedRowHeightScrollHelper::GetRowInfo(int y) {
636 if (y < top_margin_) 637 if (y < top_margin_)
637 return RowInfo(0, top_margin_); 638 return RowInfo(0, top_margin_);
638 return RowInfo((y - top_margin_) / row_height_ * row_height_ + top_margin_, 639 return RowInfo((y - top_margin_) / row_height_ * row_height_ + top_margin_,
639 row_height_); 640 row_height_);
640 } 641 }
641 642
642 } // namespace views 643 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698