ash/shell.cc - Issue 1992443002: Add Mojo IPC based input-device service.

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/shell.cc

Issue 1992443002: Add Mojo IPC based input-device service. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cleanup_ddm

Patch Set: Rebase/move. Created 4 years, 7 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/shell.cc

diff --git a/ash/shell.cc b/ash/shell.cc

index d1f99ad9e2241013b46ba48b54af3f17c8bbd9d8..caf0068d222bfd88c723634d48b79e8ed29f8a7b 100644

--- a/ash/shell.cc

+++ b/ash/shell.cc

@@ -1108,7 +1108,8 @@ void Shell::Init(const ShellInitParams& init_params) {

// WindowTreeHostManager::InitDisplays()

// since TouchTransformerController listens on

// WindowTreeHostManager::Observer::OnDisplaysInitialized().

- touch_transformer_controller_.reset(new TouchTransformerController());

+ if (!in_mus_)

+ touch_transformer_controller_.reset(new TouchTransformerController());

#endif // defined(OS_CHROMEOS)

keyboard_ui_ = init_params.keyboard_factory.is_null()