ash/desktop_background/desktop_background_view.cc - Issue 10365007: ui: Move compositor/ directory out of gfx/, up to ui/.

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/desktop_background/desktop_background_view.cc

Issue 10365007: ui: Move compositor/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix DEPS Created 8 years, 8 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/desktop_background/desktop_background_view.cc

diff --git a/ash/desktop_background/desktop_background_view.cc b/ash/desktop_background/desktop_background_view.cc

index a4179654c8af184fed919c24fe6bf3dbb77b5eac..80e3ce0591098dc38d4ac024056922d6a34d34c9 100644

--- a/ash/desktop_background/desktop_background_view.cc

+++ b/ash/desktop_background/desktop_background_view.cc

@@ -16,10 +16,10 @@

#include "grit/ui_resources.h"

#include "ui/aura/root_window.h"

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

+#include "ui/compositor/layer.h"

+#include "ui/compositor/layer_animation_observer.h"

+#include "ui/compositor/scoped_layer_animation_settings.h"

#include "ui/gfx/canvas.h"

-#include "ui/gfx/compositor/layer.h"

-#include "ui/gfx/compositor/layer_animation_observer.h"

-#include "ui/gfx/compositor/scoped_layer_animation_settings.h"

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

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

« no previous file with comments | « ash/desktop_background/desktop_background_controller.cc ('k') | ash/dip_unittest.cc » ('j') | no next file with comments »