Index: ash/shell.cc |
diff --git a/ash/shell.cc b/ash/shell.cc |
index 5d4e0c2529d9bf84e89ef347d633da7acb665c0c..53cff3d13e9ce7d3d71e9f5fe14369fcfe5adce0 100644 |
--- a/ash/shell.cc |
+++ b/ash/shell.cc |
@@ -11,7 +11,6 @@ |
#include "ash/accelerators/accelerator_controller.h" |
#include "ash/accelerators/accelerator_delegate.h" |
#include "ash/accelerators/focus_manager_factory.h" |
-#include "ash/accelerators/nested_accelerator_delegate.h" |
#include "ash/ash_switches.h" |
#include "ash/autoclick/autoclick_controller.h" |
#include "ash/desktop_background/desktop_background_controller.h" |
@@ -109,7 +108,6 @@ |
#include "ui/wm/core/accelerator_filter.h" |
#include "ui/wm/core/compound_event_filter.h" |
#include "ui/wm/core/focus_controller.h" |
-#include "ui/wm/core/nested_accelerator_controller.h" |
#include "ui/wm/core/shadow_controller.h" |
#include "ui/wm/core/visibility_controller.h" |
#include "ui/wm/core/window_modality_controller.h" |
@@ -784,7 +782,6 @@ Shell::~Shell() { |
partial_magnification_controller_.reset(); |
tooltip_controller_.reset(); |
event_client_.reset(); |
- nested_accelerator_controller_.reset(); |
toplevel_window_event_handler_.reset(); |
visibility_controller_.reset(); |
// |shelf_item_delegate_manager_| observes |shelf_model_|. It must be |
@@ -922,8 +919,6 @@ void Shell::Init(const ShellInitParams& init_params) { |
cursor_manager_.SetDisplay(gfx::Screen::GetScreen()->GetPrimaryDisplay()); |
- nested_accelerator_controller_.reset( |
- new ::wm::NestedAcceleratorController(new NestedAcceleratorDelegate)); |
accelerator_controller_.reset(new AcceleratorController); |
maximize_mode_controller_.reset(new MaximizeModeController()); |
@@ -1131,11 +1126,6 @@ void Shell::InitRootWindow(aura::Window* root_window) { |
toplevel_window_event_handler_.get()); |
root_window->AddPreTargetHandler(toplevel_window_event_handler_.get()); |
root_window->AddPostTargetHandler(toplevel_window_event_handler_.get()); |
- |
- if (nested_accelerator_controller_) { |
- aura::client::SetDispatcherClient(root_window, |
- nested_accelerator_controller_.get()); |
- } |
} |
bool Shell::CanWindowReceiveEvents(aura::Window* window) { |