summaryrefslogtreecommitdiffstats
path: root/ash/wm/activation_controller_unittest.cc
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-05 21:45:41 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-05 21:45:41 +0000
commit116302fcae9274397db086a454d18cbcb354027b (patch)
treeafdc95d27dc82a6e2d7cd31aa14a9c45bb60843d /ash/wm/activation_controller_unittest.cc
parent6d2d55b661b11e038d53c4b9271b67e719a72cc6 (diff)
downloadchromium_src-116302fcae9274397db086a454d18cbcb354027b.zip
chromium_src-116302fcae9274397db086a454d18cbcb354027b.tar.gz
chromium_src-116302fcae9274397db086a454d18cbcb354027b.tar.bz2
ui: Move compositor/ directory out of gfx/, up to ui/.
BUG=104040 R=piman@chromium.org,ben@chromium.org TBR=sky@chromium.org Review URL: https://chromiumcodereview.appspot.com/10365007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135560 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/activation_controller_unittest.cc')
-rw-r--r--ash/wm/activation_controller_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/wm/activation_controller_unittest.cc b/ash/wm/activation_controller_unittest.cc
index bacef8d..ad99e02 100644
--- a/ash/wm/activation_controller_unittest.cc
+++ b/ash/wm/activation_controller_unittest.cc
@@ -15,7 +15,7 @@
#include "ui/aura/test/event_generator.h"
#include "ui/aura/test/test_window_delegate.h"
#include "ui/aura/test/test_windows.h"
-#include "ui/gfx/compositor/layer.h"
+#include "ui/compositor/layer.h"
#if defined(OS_WIN)
// Windows headers define macros for these function names which screw with us.