ui/views/controls/scroll_view.cc - Issue 1671313002: MacViews: Overlay Scrollbars with Show/Hide Animations

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/views/controls/scroll_view.cc

Issue 1671313002: MacViews: Overlay Scrollbars with Show/Hide Animations (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 10 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

« ui/compositor/layer_animator.h ('K') | « ui/views/cocoa/views_scrollbar_bridge.mm ('k') | ui/views/controls/scrollbar/cocoa_scroll_bar.h » ('j') | ui/views/controls/scrollbar/cocoa_scroll_bar.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/views/controls/scroll_view.cc

diff --git a/ui/views/controls/scroll_view.cc b/ui/views/controls/scroll_view.cc

index 6902a8a346086f5c5bb89afbf9dfb658b1755b76..db49f2f890d5dddcb6f2748591719caf8f0d6407 100644

--- a/ui/views/controls/scroll_view.cc

+++ b/ui/views/controls/scroll_view.cc

@@ -10,7 +10,7 @@

#include "ui/gfx/canvas.h"

#include "ui/native_theme/native_theme.h"

#include "ui/views/border.h"

-#include "ui/views/controls/scrollbar/native_scroll_bar.h"

+#include "ui/views/style/platform_style.h"

#include "ui/views/widget/root_view.h"

namespace views {

@@ -124,8 +124,8 @@ ScrollView::ScrollView()

contents_viewport_(new Viewport()),

header_(NULL),

header_viewport_(new Viewport()),

- horiz_sb_(new NativeScrollBar(true)),

- vert_sb_(new NativeScrollBar(false)),

+ horiz_sb_(PlatformStyle::CreateScrollBar(true).release()),

+ vert_sb_(PlatformStyle::CreateScrollBar(false).release()),

corner_view_(new ScrollCornerView()),

min_height_(-1),

max_height_(-1),