Unify display ids between Display and PlatformDisplay.

services/ui/ws/touch_controller.cc

 // Copyright 2016 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/ws/touch_controller.h"
 
 #include <set>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 64 matching lines @@
   const std::vector<ui::TouchscreenDevice>& touch_devices =
       device_manager->GetTouchscreenDevices();
 
   // Mash can only handle a single display so this doesn't implement support for
   // matching touchscreens with multiple displays.
   // TODO(kylechar): Implement support for multiple displays when needed.
   if (touch_displays.size() == 1 && touch_devices.size() == 1) {
     const Display* touch_display = *touch_displays.begin();
     const ui::TouchscreenDevice& touch_device = touch_devices[0];
 
-    int64_t touch_display_id = touch_display->GetPlatformDisplayId();
+    int64_t touch_display_id = touch_display->id();
     int touch_device_id = touch_device.id;
 
     if (touch_device_id != ui::InputDevice::kInvalidId) {
       device_manager->UpdateTouchRadiusScale(
           touch_device_id,
           ComputeTouchResolutionScale(touch_display, touch_device));
 
       device_manager->UpdateTouchInfoForDisplay(
           touch_display_id, touch_device_id,
           ComputeTouchTransform(touch_display, touch_device));
     }
   }
 }
 
 void TouchController::OnTouchscreenDeviceConfigurationChanged() {
   UpdateTouchTransforms();
 }
 
 }  // namespace ws
 }  // namespace ui