chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc - 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: chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc

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: chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc

diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc

index 399bd0d4c626d319c951e4b38e443128f15ce164..50d0da6e606d631c225b669f1c0808d340ce18d6 100644

--- a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc

+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc

@@ -352,7 +352,7 @@ void BookmarkBarGtk::CalculateMaxHeight() {

}

-void BookmarkBarGtk::AnimationProgressed(const ui::Animation* animation) {

+void BookmarkBarGtk::AnimationProgressed(const gfx::Animation* animation) {

DCHECK_EQ(animation, &slide_animation_);

gint height =

@@ -362,7 +362,7 @@ void BookmarkBarGtk::AnimationProgressed(const ui::Animation* animation) {

gtk_widget_set_size_request(event_box_.get(), -1, height);

}

-void BookmarkBarGtk::AnimationEnded(const ui::Animation* animation) {

+void BookmarkBarGtk::AnimationEnded(const gfx::Animation* animation) {

DCHECK_EQ(animation, &slide_animation_);

if (!slide_animation_.IsShowing()) {