diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-30 16:02:19 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-30 16:02:19 +0000 |
| commit | 0ef01758553859789de6ae92939fb6e3babc1b34 (patch) | |
| tree | c6ece59a4f2dc6ca00e2919f6311df75d99f71fb /ui/aura_shell/shell_accelerator_controller.cc | |
| parent | 9f668362af799212f3345477f01540ffbc656ed1 (diff) | |
| download | chromium_src-0ef01758553859789de6ae92939fb6e3babc1b34.zip chromium_src-0ef01758553859789de6ae92939fb6e3babc1b34.tar.gz chromium_src-0ef01758553859789de6ae92939fb6e3babc1b34.tar.bz2 | |
Added hotkey support to 8508009
Alt-L (print layer tree)
Added name in RenderWidgetHostViewAura
Made Window::SetName update the layer name.
Review URL: http://codereview.chromium.org/8585007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112232 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura_shell/shell_accelerator_controller.cc')
| -rw-r--r-- | ui/aura_shell/shell_accelerator_controller.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ui/aura_shell/shell_accelerator_controller.cc b/ui/aura_shell/shell_accelerator_controller.cc index 99f12a4..3453931 100644 --- a/ui/aura_shell/shell_accelerator_controller.cc +++ b/ui/aura_shell/shell_accelerator_controller.cc @@ -9,6 +9,7 @@ #include "ui/aura_shell/shell.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_animation_sequence.h" #include "ui/gfx/compositor/layer_animator.h" #include "ui/gfx/compositor/screen_rotation.h" @@ -24,6 +25,7 @@ struct AcceleratorData { } kAcceleratorData[] = { { ui::VKEY_F11, false, false, false }, { ui::VKEY_HOME, false, true, false }, + { ui::VKEY_L, false, false, true }, }; // Registers the accelerators with ShellAcceleratorController. @@ -118,6 +120,10 @@ bool ShellAcceleratorController::AcceleratorPressed( accelerator.IsCtrlDown()) { RotateScreen(); return true; + } else if (accelerator.key_code() == ui::VKEY_L && + accelerator.IsAltDown()) { + ui::PrintLayerHierarchy(aura::Desktop::GetInstance()->layer()); + return true; } #endif return false; |