| 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) {
|
|
|