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

Unified Diff: chrome/views/native_scroll_bar.cc

Issue 7344: Convert GetPreferredSize from:... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 12 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: chrome/views/native_scroll_bar.cc
===================================================================
--- chrome/views/native_scroll_bar.cc (revision 3391)
+++ chrome/views/native_scroll_bar.cc (working copy)
@@ -250,15 +250,10 @@
Layout();
}
-void NativeScrollBar::GetPreferredSize(CSize *out) {
- DCHECK(out);
- if (IsHorizontal()) {
- out->cx = 0;
- out->cy = GetLayoutSize();
- } else {
- out->cx = GetLayoutSize();
- out->cy = 0;
- }
+gfx::Size NativeScrollBar::GetPreferredSize() {
+ if (IsHorizontal())
+ return gfx::Size(0, GetLayoutSize());
+ return gfx::Size(GetLayoutSize(), 0);
}
void NativeScrollBar::Update(int viewport_size, int content_size, int current_pos) {

Powered by Google App Engine
This is Rietveld 408576698