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

Issues Search
    My Issues | Starred     Open | Closed | All

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/update. Created 4 years, 6 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 | « no previous file | ash/sysui/manifest.json » ('j') | components/mus/input_devices/input_device.typemap » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index ff446835ff9948573fcd978ba1d39c9ae56fcac9..0773df6ba862bb6370360eb15883d3fecbf82683 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());
sadrul 2016/06/07 03:39:25 This could be a separate CL
kylechar 2016/06/07 16:36:41 Done.
#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/input_device.typemap » ('J')

Powered by Google App Engine
This is Rietveld 408576698