ui/app_list/views/app_list_item_view.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: ui/app_list/views/app_list_item_view.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: ui/app_list/views/app_list_item_view.cc

diff --git a/ui/app_list/views/app_list_item_view.cc b/ui/app_list/views/app_list_item_view.cc

index a5ab09d3ff2266ae9ac49c93574c258fb23ab94c..2717f51a82589ae0543780def7fb32f8307ca618 100644

--- a/ui/app_list/views/app_list_item_view.cc

+++ b/ui/app_list/views/app_list_item_view.cc

@@ -13,11 +13,11 @@

#include "ui/app_list/views/cached_label.h"

#include "ui/app_list/views/progress_bar_view.h"

#include "ui/base/accessibility/accessible_view_state.h"

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

#include "ui/base/dragdrop/drag_utils.h"

#include "ui/base/resource/resource_bundle.h"

#include "ui/compositor/layer.h"

#include "ui/compositor/scoped_layer_animation_settings.h"

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

#include "ui/gfx/canvas.h"

#include "ui/gfx/font.h"

#include "ui/gfx/image/image_skia_operations.h"

« no previous file with comments | « ui/app_list/pagination_model.cc ('k') | ui/app_list/views/apps_grid_view.cc » ('j') | no next file with comments »