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

diff --git a/ash/launcher/launcher_view_unittest.cc b/ash/launcher/launcher_view_unittest.cc

index 38162c5ec5e0b4440696c376c93ca5dfd2ef0cb4..fa90f970036258ae5ffe89162f616e2e391f50f9 100644

--- a/ash/launcher/launcher_view_unittest.cc

+++ b/ash/launcher/launcher_view_unittest.cc

@@ -6,8 +6,8 @@

#include "ash/launcher/launcher.h"

#include "ash/launcher/launcher_button.h"

-#include "ash/launcher/launcher_model.h"

#include "ash/launcher/launcher_icon_observer.h"

+#include "ash/launcher/launcher_model.h"

#include "ash/shell.h"

#include "ash/test/ash_test_base.h"

#include "ash/test/launcher_view_test_api.h"

@@ -15,9 +15,9 @@

#include "base/basictypes.h"

#include "base/compiler_specific.h"

#include "base/memory/scoped_ptr.h"

-#include "ui/aura/window.h"

#include "ui/aura/test/aura_test_base.h"

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

+#include "ui/aura/window.h"

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

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

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

« no previous file with comments | « ash/launcher/launcher_view.cc ('k') | ash/magnifier/magnification_controller.cc » ('j') | no next file with comments »