ash/app_list/app_list.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/app_list/app_list.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/app_list/app_list.cc

diff --git a/ash/app_list/app_list.cc b/ash/app_list/app_list.cc

index 4f93902693b07959d64957e520f54289899643d2..7971973b0241bd10ed2d728600b627d2bfe7213c 100644

--- a/ash/app_list/app_list.cc

+++ b/ash/app_list/app_list.cc

@@ -6,16 +6,16 @@

#include "ash/app_list/app_list_view.h"

#include "ash/app_list/icon_cache.h"

-#include "ash/shell_delegate.h"

#include "ash/shell.h"

+#include "ash/shell_delegate.h"

#include "ash/shell_window_ids.h"

#include "ash/wm/shelf_layout_manager.h"

#include "ash/wm/window_util.h"

#include "ui/aura/event.h"

#include "ui/aura/root_window.h"

#include "ui/aura/window.h"

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

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

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

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

#include "ui/gfx/screen.h"

#include "ui/gfx/transform_util.h"

« no previous file with comments | « ash/app_list/app_list.h ('k') | ash/app_list/app_list_view.cc » ('j') | no next file with comments »