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/desktop_background | |
| 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/desktop_background')
| -rw-r--r-- | ash/desktop_background/desktop_background_controller.cc | 4 | ||||
| -rw-r--r-- | ash/desktop_background/desktop_background_view.cc | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ash/desktop_background/desktop_background_controller.cc b/ash/desktop_background/desktop_background_controller.cc index e512d66..e345158 100644 --- a/ash/desktop_background/desktop_background_controller.cc +++ b/ash/desktop_background/desktop_background_controller.cc @@ -12,9 +12,9 @@ #include "base/logging.h" #include "grit/ui_resources.h" #include "ui/aura/window.h" -#include "ui/gfx/compositor/layer.h" -#include "ui/gfx/image/image.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/compositor/layer.h" +#include "ui/gfx/image/image.h" #include "ui/views/widget/widget.h" namespace ash { diff --git a/ash/desktop_background/desktop_background_view.cc b/ash/desktop_background/desktop_background_view.cc index a417965..80e3ce0 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" |