| Index: ui/aura_shell/shell.cc
|
| diff --git a/ui/aura_shell/shell.cc b/ui/aura_shell/shell.cc
|
| index dc40423beb690ee3840f3c19588454a8548f6f58..79cf3f2f4facec95f9fc83d1ba88c9e69bd6950f 100644
|
| --- a/ui/aura_shell/shell.cc
|
| +++ b/ui/aura_shell/shell.cc
|
| @@ -23,6 +23,7 @@
|
| #include "ui/aura_shell/toplevel_layout_manager.h"
|
| #include "ui/aura_shell/toplevel_window_event_filter.h"
|
| #include "ui/aura_shell/workspace_controller.h"
|
| +#include "ui/base/accelerator_manager.h"
|
| #include "ui/gfx/compositor/layer.h"
|
| #include "ui/gfx/compositor/layer_animator.h"
|
| #include "views/widget/native_widget_aura.h"
|
| @@ -84,7 +85,8 @@ Shell* Shell::instance_ = NULL;
|
|
|
| Shell::Shell(ShellDelegate* delegate)
|
| : ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)),
|
| - delegate_(delegate) {
|
| + delegate_(delegate),
|
| + accelerator_manager_(new ui::AcceleratorManager) {
|
| aura::Desktop::GetInstance()->SetEventFilter(
|
| new internal::DesktopEventFilter);
|
| aura::Desktop::GetInstance()->SetStackingClient(
|
| @@ -167,6 +169,8 @@ void Shell::Init() {
|
| toplevel_layout_manager->set_shelf(shelf_layout_controller_.get());
|
| }
|
|
|
| + desktop_window->RegisterAccelerators(accelerator_manager());
|
| +
|
| // Force a layout.
|
| desktop_layout->OnWindowResized();
|
| }
|
|
|