diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-25 15:02:11 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-25 15:02:11 +0000 |
| commit | 2b68f8170eac47782a7680fc97b44886e27ac2fe (patch) | |
| tree | 4ac3bd72425f89bed4226f0d724d089362c5ede3 /ui/aura_shell | |
| parent | 3138146004b13a2f1a249da15531d96a53f3e2d2 (diff) | |
| download | chromium_src-2b68f8170eac47782a7680fc97b44886e27ac2fe.zip chromium_src-2b68f8170eac47782a7680fc97b44886e27ac2fe.tar.gz chromium_src-2b68f8170eac47782a7680fc97b44886e27ac2fe.tar.bz2 | |
Move accelerator related files to ui/base/accelerators
BUG=104599
R=mazda@chromium.org
Review URL: http://codereview.chromium.org/8695005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111597 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura_shell')
| -rw-r--r-- | ui/aura_shell/shell_accelerator_controller.cc | 4 | ||||
| -rw-r--r-- | ui/aura_shell/shell_accelerator_controller.h | 4 | ||||
| -rw-r--r-- | ui/aura_shell/shell_accelerator_filter.cc | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/ui/aura_shell/shell_accelerator_controller.cc b/ui/aura_shell/shell_accelerator_controller.cc index 9c67a9d..99f12a4 100644 --- a/ui/aura_shell/shell_accelerator_controller.cc +++ b/ui/aura_shell/shell_accelerator_controller.cc @@ -7,8 +7,8 @@ #include "ui/aura/desktop.h" #include "ui/aura/event.h" #include "ui/aura_shell/shell.h" -#include "ui/base/accelerator_manager.h" -#include "ui/base/models/accelerator.h" +#include "ui/base/accelerators/accelerator.h" +#include "ui/base/accelerators/accelerator_manager.h" #include "ui/gfx/compositor/layer_animation_sequence.h" #include "ui/gfx/compositor/layer_animator.h" #include "ui/gfx/compositor/screen_rotation.h" diff --git a/ui/aura_shell/shell_accelerator_controller.h b/ui/aura_shell/shell_accelerator_controller.h index 14f1f3a..86fe41b 100644 --- a/ui/aura_shell/shell_accelerator_controller.h +++ b/ui/aura_shell/shell_accelerator_controller.h @@ -10,11 +10,11 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "ui/aura_shell/aura_shell_export.h" -#include "ui/base/models/accelerator.h" +#include "ui/base/accelerators/accelerator.h" namespace ui { class AcceleratorManager; -} // namespace ui +} namespace aura_shell { diff --git a/ui/aura_shell/shell_accelerator_filter.cc b/ui/aura_shell/shell_accelerator_filter.cc index 3a9cde5..aeacf8e 100644 --- a/ui/aura_shell/shell_accelerator_filter.cc +++ b/ui/aura_shell/shell_accelerator_filter.cc @@ -8,8 +8,8 @@ #include "ui/aura/event.h" #include "ui/aura_shell/shell.h" #include "ui/aura_shell/shell_accelerator_controller.h" -#include "ui/base/accelerator_manager.h" -#include "ui/base/models/accelerator.h" +#include "ui/base/accelerators/accelerator.h" +#include "ui/base/accelerators/accelerator_manager.h" namespace { const int kModifierFlagMask = (ui::EF_SHIFT_DOWN | |