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/accelerators/accelerator_controller.cc | |
| 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/accelerators/accelerator_controller.cc')
| -rw-r--r-- | ash/accelerators/accelerator_controller.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc index 2deeb97..800bf44 100644 --- a/ash/accelerators/accelerator_controller.cc +++ b/ash/accelerators/accelerator_controller.cc @@ -5,14 +5,14 @@ #include "ash/accelerators/accelerator_controller.h" #include "ash/accelerators/accelerator_table.h" -#include "ash/desktop_background/desktop_background_controller.h" #include "ash/ash_switches.h" #include "ash/caps_lock_delegate.h" +#include "ash/desktop_background/desktop_background_controller.h" #include "ash/focus_cycler.h" #include "ash/ime_control_delegate.h" #include "ash/launcher/launcher.h" -#include "ash/launcher/launcher_model.h" #include "ash/launcher/launcher_delegate.h" +#include "ash/launcher/launcher_model.h" #include "ash/monitor/multi_monitor_manager.h" #include "ash/screenshot_delegate.h" #include "ash/shell.h" @@ -30,11 +30,11 @@ #include "ui/aura/root_window.h" #include "ui/base/accelerators/accelerator.h" #include "ui/base/accelerators/accelerator_manager.h" -#include "ui/gfx/compositor/debug_utils.h" -#include "ui/gfx/compositor/layer.h" -#include "ui/gfx/compositor/layer_animation_sequence.h" -#include "ui/gfx/compositor/layer_animator.h" -#include "ui/gfx/compositor/screen_rotation.h" +#include "ui/compositor/debug_utils.h" +#include "ui/compositor/layer.h" +#include "ui/compositor/layer_animation_sequence.h" +#include "ui/compositor/layer_animator.h" +#include "ui/compositor/screen_rotation.h" #include "ui/oak/oak.h" namespace { |