Add full touch support to mus.

services/ui/service.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "services/ui/service.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 165 matching lines @@
   DCHECK(ui::ClientNativePixmapFactory::GetInstance());
 #endif
 
 // TODO(rjkroege): Enter sandbox here before we start threads in GpuState
 // http://crbug.com/584532
 
 #if !defined(OS_ANDROID)
   event_source_ = ui::PlatformEventSource::CreateDefault();
 #endif
 
   // This needs to happen after DeviceDataManager has been constructed. That

[msw, 2017/01/10 19:43:27]

optional nit: dcheck for DeviceDataManager::HasInstance here?

[kylechar, 2017/01/10 22:12:18]

There is an if DDM::HasInstance() in the method that gets called. Not a DCHECK
though, since Windows/Mac won't ever initialize it.

[msw, 2017/01/10 22:36:57]

Acknowledged.

   // happens either during OzonePlatform or PlatformEventSource initialization,
   // so keep this line below both of those.
   input_device_server_.RegisterAsObserver();
 
   // Gpu must be running before the ScreenManager can be initialized.
   window_server_.reset(new ws::WindowServer(this));
 
-  // DeviceDataManager must be initialized before TouchController. On non-Linux
-  // platforms there is no DeviceDataManager so don't create touch controller.
-  if (ui::DeviceDataManager::HasInstance())
-    touch_controller_.reset(
-        new ws::TouchController(window_server_->display_manager()));
-
   ime_server_.Init(context()->connector(), test_config_);
 
   discardable_shared_memory_manager_ =
       base::MakeUnique<discardable_memory::DiscardableSharedMemoryManager>();
 }
 
 bool Service::OnConnect(const service_manager::ServiceInfo& remote_info,
                         service_manager::InterfaceRegistry* registry) {
   registry->AddInterface<mojom::AccessibilityManager>(this);
   registry->AddInterface<mojom::Clipboard>(this);
@@ skipping 46 matching lines @@
   if (base::MessageLoop::current() &&
       base::MessageLoop::current()->is_running()) {
     base::MessageLoop::current()->QuitWhenIdle();
   }
 }
 
 bool Service::IsTestConfig() const {
   return test_config_;
 }
 
-void Service::UpdateTouchTransforms() {
-  if (touch_controller_)
-    touch_controller_->UpdateTouchTransforms();
-}
-
 void Service::Create(const service_manager::Identity& remote_identity,
                      mojom::AccessibilityManagerRequest request) {
   UserState* user_state = GetUserState(remote_identity);
   if (!user_state->accessibility) {
     const ws::UserId& user_id = remote_identity.user_id();
     user_state->accessibility.reset(
         new ws::AccessibilityManager(window_server_.get(), user_id));
   }
   user_state->accessibility->Bind(std::move(request));
 }
@@ skipping 95 matching lines @@
                      mojom::WindowServerTestRequest request) {
   if (!test_config_)
     return;
   mojo::MakeStrongBinding(
       base::MakeUnique<ws::WindowServerTestImpl>(window_server_.get()),
       std::move(request));
 }
 
 
 }  // namespace ui