ash/shelf/shelf_background_animator.cc - Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3"

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: ash/shelf/shelf_background_animator.cc

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)

Patch Set: Created 3 years, 9 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: ash/shelf/shelf_background_animator.cc

diff --git a/ash/shelf/shelf_background_animator.cc b/ash/shelf/shelf_background_animator.cc

index c640d0ebcb52fd0987c943ca2639ffb3abd46b2c..00b3347c34eee9c3ab8b07aa22a13030c7278982 100644

--- a/ash/shelf/shelf_background_animator.cc

+++ b/ash/shelf/shelf_background_animator.cc

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

#include <algorithm>

#include "ash/animation/animation_change_type.h"

+#include "ash/common/wallpaper/wallpaper_controller.h"

#include "ash/shelf/shelf_background_animator_observer.h"

#include "ash/shelf/shelf_constants.h"

#include "ash/shelf/wm_shelf.h"

-#include "ash/wallpaper/wallpaper_controller.h"

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

#include "ui/gfx/color_utils.h"