ash/mus/bridge/wm_shell_mus.h - Issue 2170753005: Moves AcceleratorController from Shell to WmShell

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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:

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_;