ui/views/controls/scrollbar/overlay_scroll_bar.h - Issue 23531053: ui/base/animation -> ui/gfx/animation

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/scrollbar/overlay_scroll_bar.h

Issue 23531053: ui/base/animation -> ui/gfx/animation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge 2 trunk Created 7 years, 3 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:

Index: ui/views/controls/scrollbar/overlay_scroll_bar.h

diff --git a/ui/views/controls/scrollbar/overlay_scroll_bar.h b/ui/views/controls/scrollbar/overlay_scroll_bar.h

index ac64d3560975e3f077d23453886d67d70ff04d2f..b061da08586f23c04af68227c973d3acc59e7247 100644

--- a/ui/views/controls/scrollbar/overlay_scroll_bar.h

+++ b/ui/views/controls/scrollbar/overlay_scroll_bar.h

@@ -5,7 +5,7 @@

#ifndef UI_VIEWS_CONTROLS_SCROLLBAR_OVERLAY_SCROLL_BAR_H_

#define UI_VIEWS_CONTROLS_SCROLLBAR_OVERLAY_SCROLL_BAR_H_

-#include "ui/base/animation/slide_animation.h"

+#include "ui/gfx/animation/slide_animation.h"

#include "ui/views/controls/scrollbar/base_scroll_bar.h"

namespace views {

@@ -33,7 +33,7 @@ class VIEWS_EXPORT OverlayScrollBar : public BaseScrollBar {

virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;

private:

- ui::SlideAnimation animation_;

+ gfx::SlideAnimation animation_;

DISALLOW_COPY_AND_ASSIGN(OverlayScrollBar);

};