diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-05 21:45:41 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-05 21:45:41 +0000 |
| commit | 116302fcae9274397db086a454d18cbcb354027b (patch) | |
| tree | afdc95d27dc82a6e2d7cd31aa14a9c45bb60843d /ash/magnifier | |
| parent | 6d2d55b661b11e038d53c4b9271b67e719a72cc6 (diff) | |
| download | chromium_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/magnifier')
| -rw-r--r-- | ash/magnifier/magnification_controller.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/magnifier/magnification_controller.cc b/ash/magnifier/magnification_controller.cc index 262a9c4..af07eae 100644 --- a/ash/magnifier/magnification_controller.cc +++ b/ash/magnifier/magnification_controller.cc @@ -8,8 +8,8 @@ #include "ui/aura/root_window.h" #include "ui/aura/window.h" #include "ui/aura/window_property.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" namespace { |