Adds special support to the device manager for keyboards devices.

ash/touch/touch_transformer_controller_unittest.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 "ash/touch/touch_transformer_controller.h"
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/events/device_data_manager.h"
 #include "ui/events/test/events_test_utils_x11.h"
 #include "ui/gfx/display.h"
 
 namespace ash {
 
 namespace {
 DisplayInfo CreateDisplayInfo(int64 id,
-                              int touch_device_id,
+                              unsigned int touch_device_id,
                               const gfx::Rect& bounds) {
   DisplayInfo info(id, std::string(), false);
   info.SetBounds(bounds);
   info.set_touch_device_id(touch_device_id);
   return info;
 }
 }  //  namespace
 
 typedef test::AshTestBase TouchTransformerControllerTest;
 
 TEST_F(TouchTransformerControllerTest, TouchTransformerMirrorModeLetterboxing) {
   // The internal display has native resolution of 2560x1700, and in
   // mirror mode it is configured as 1920x1200. This is in letterboxing
   // mode.
   DisplayInfo internal_display_info =
-      CreateDisplayInfo(1, 10, gfx::Rect(0, 0, 1920, 1200));
+      CreateDisplayInfo(1, 10u, gfx::Rect(0, 0, 1920, 1200));
   std::vector<DisplayMode> internal_modes;
   internal_modes.push_back(
       DisplayMode(gfx::Size(2560, 1700), 60, false, true));
   internal_modes.push_back(
       DisplayMode(gfx::Size(1920, 1200), 60, false, false));
   internal_display_info.set_display_modes(internal_modes);
 
   DisplayInfo external_display_info =
-      CreateDisplayInfo(2, 11, gfx::Rect(0, 0, 1920, 1200));
+      CreateDisplayInfo(2, 11u, gfx::Rect(0, 0, 1920, 1200));
 
   TouchTransformerController* tt_controller =
       Shell::GetInstance()->touch_transformer_controller();
   ui::DeviceDataManager* device_manager = ui::DeviceDataManager::GetInstance();
 
   tt_controller->force_compute_mirror_mode_touch_transformer_ = true;
   device_manager->UpdateTouchInfoForDisplay(
       internal_display_info.id(),
       internal_display_info.touch_device_id(),
       tt_controller->GetMirrorModeTouchTransformer(internal_display_info));
@@ skipping 93 matching lines @@
   EXPECT_EQ(1024, static_cast<int>(x));
   EXPECT_EQ(100, static_cast<int>(y));
 }
 
 TEST_F(TouchTransformerControllerTest, TouchTransformerExtendedMode) {
   // The internal display has size 1366 x 768. The external display has
   // size 2560x1600. The total frame buffer is 2560x2428,
   // where 2428 = 768 + 60 (hidden gap) + 1600
   // and the sceond monitor is translated to Point (0, 828) in the
   // framebuffer.
-  DisplayInfo display1 = CreateDisplayInfo(1, 5, gfx::Rect(0, 0, 1366, 768));
-  DisplayInfo display2 = CreateDisplayInfo(2, 6, gfx::Rect(0, 828, 2560, 1600));
+  DisplayInfo display1 = CreateDisplayInfo(1, 5u, gfx::Rect(0, 0, 1366, 768));
+  DisplayInfo display2 =
+      CreateDisplayInfo(2, 6u, gfx::Rect(0, 828, 2560, 1600));
   gfx::Size fb_size(2560, 2428);
 
   TouchTransformerController* tt_controller =
       Shell::GetInstance()->touch_transformer_controller();
   ui::DeviceDataManager* device_manager = ui::DeviceDataManager::GetInstance();
 
   device_manager->UpdateTouchInfoForDisplay(
       display1.id(),
       display1.touch_device_id(),
       tt_controller->GetExtendedModeTouchTransformer(display1, fb_size));
@@ skipping 29 matching lines @@
   EXPECT_EQ(0, static_cast<int>(y));
 
   x = 2559.0;
   y = 2427.0;
   device_manager->ApplyTouchTransformer(6, &x, &y);
   EXPECT_EQ(2559, static_cast<int>(x));
   EXPECT_EQ(1599, static_cast<int>(y));
 }
 
 TEST_F(TouchTransformerControllerTest, TouchRadiusScale) {
-  DisplayInfo display = CreateDisplayInfo(1, 5, gfx::Rect(0, 0, 2560, 1600));
+  DisplayInfo display = CreateDisplayInfo(1, 5u, gfx::Rect(0, 0, 2560, 1600));
   std::vector<unsigned int> devices;
   devices.push_back(5);
   ui::SetUpTouchDevicesForTest(devices);
 
   TouchTransformerController* tt_controller =
       Shell::GetInstance()->touch_transformer_controller();
   // Default touchscreen position range is 1001x1001;
   EXPECT_EQ(sqrt((2560.0 * 1600.0) / (1001.0 * 1001.0)),
             tt_controller->GetTouchResolutionScale(display));
 }
 
 }  // namespace ash