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

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: Updated. 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:
View side-by-side diff with in-line comments
Download patch
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 4276304dd488ca09e6509ac21d6aca5d0ff8ec02..b5b9fd99a0a8f11ba6f022c7a55d972c1ae7b93e 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -1109,7 +1109,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()
« no previous file with comments | « no previous file | ash/sysui/manifest.json » ('j') | components/mus/input_devices/public/interfaces/input_devices.mojom » ('J')

Powered by Google App Engine
This is Rietveld 408576698