Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2877)

Unified Diff: ash/mus/bridge/wm_shell_mus.cc

Issue 2170753005: Moves AcceleratorController from Shell to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: include Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/mus/bridge/wm_shell_mus.h ('k') | ash/shelf/shelf_layout_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/bridge/wm_shell_mus.cc
diff --git a/ash/mus/bridge/wm_shell_mus.cc b/ash/mus/bridge/wm_shell_mus.cc
index 9b7aecd237877dfd3a6656626afcbc38486df501..195250df2644716dc4aec814cbbce0e2c7711a89 100644
--- a/ash/mus/bridge/wm_shell_mus.cc
+++ b/ash/mus/bridge/wm_shell_mus.cc
@@ -6,6 +6,7 @@
#include <utility>
+#include "ash/common/accelerators/accelerator_controller.h"
#include "ash/common/display/display_info.h"
#include "ash/common/keyboard/keyboard_ui.h"
#include "ash/common/session/session_state_delegate.h"
@@ -19,6 +20,7 @@
#include "ash/common/wm/window_cycle_event_filter.h"
#include "ash/common/wm/window_resizer.h"
#include "ash/common/wm_activation_observer.h"
+#include "ash/mus/accelerators/accelerator_controller_delegate_mus.h"
#include "ash/mus/bridge/wm_root_window_controller_mus.h"
#include "ash/mus/bridge/wm_window_mus.h"
#include "ash/mus/container_ids.h"
@@ -104,6 +106,10 @@ WmShellMus::WmShellMus(std::unique_ptr<ShellDelegate> shell_delegate,
client_->AddObserver(this);
WmShell::Set(this);
+ accelerator_controller_delegate_.reset(new AcceleratorControllerDelegateMus);
+ SetAcceleratorController(base::MakeUnique<AcceleratorController>(
+ accelerator_controller_delegate_.get()));
+
CreateMaximizeModeController();
CreateMruWindowTracker();
« no previous file with comments | « ash/mus/bridge/wm_shell_mus.h ('k') | ash/shelf/shelf_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698