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

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

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/accelerators/accelerator_controller_delegate_mus.cc ('k') | ash/mus/bridge/wm_shell_mus.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.h
diff --git a/ash/mus/bridge/wm_shell_mus.h b/ash/mus/bridge/wm_shell_mus.h
index 0342c31e26f5f724f9852d9f5dedd9ebc517cebf..938a1d5cefcbadc4f0585ac1c73351aef8a76cd1 100644
--- a/ash/mus/bridge/wm_shell_mus.h
+++ b/ash/mus/bridge/wm_shell_mus.h
@@ -26,6 +26,7 @@ class WindowTreeClient;
namespace ash {
namespace mus {
+class AcceleratorControllerDelegateMus;
class WmRootWindowControllerMus;
class WmWindowMus;
@@ -102,6 +103,8 @@ class WmShellMus : public WmShell, public ::ui::WindowTreeClientObserver {
std::vector<WmRootWindowControllerMus*> root_window_controllers_;
+ std::unique_ptr<AcceleratorControllerDelegateMus>
+ accelerator_controller_delegate_;
std::unique_ptr<SessionStateDelegate> session_state_delegate_;
base::ObserverList<WmActivationObserver> activation_observers_;
« no previous file with comments | « ash/mus/accelerators/accelerator_controller_delegate_mus.cc ('k') | ash/mus/bridge/wm_shell_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698