| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <string> | 5 #include <string> |
| 6 #include <vector> | 6 #include <vector> |
| 7 | 7 |
| 8 #include "ash/display/display_info.h" | 8 #include "ash/display/display_info.h" |
| 9 #include "ash/touch/touchscreen_util.h" | 9 #include "ash/touch/touchscreen_util.h" |
| 10 #include "testing/gtest/include/gtest/gtest.h" | 10 #include "testing/gtest/include/gtest/gtest.h" |
| 11 #include "ui/events/input_device.h" | 11 #include "ui/events/devices/input_device.h" |
| 12 | 12 |
| 13 namespace ash { | 13 namespace ash { |
| 14 | 14 |
| 15 class TouchscreenUtilTest : public testing::Test { | 15 class TouchscreenUtilTest : public testing::Test { |
| 16 public: | 16 public: |
| 17 TouchscreenUtilTest() {} | 17 TouchscreenUtilTest() {} |
| 18 virtual ~TouchscreenUtilTest() {} | 18 virtual ~TouchscreenUtilTest() {} |
| 19 | 19 |
| 20 virtual void SetUp() override { | 20 virtual void SetUp() override { |
| 21 // Internal display will always match to internal touchscreen. If internal | 21 // Internal display will always match to internal touchscreen. If internal |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 AssociateTouchscreens(&displays_, devices); | 147 AssociateTouchscreens(&displays_, devices); |
| 148 | 148 |
| 149 // Internal touchscreen is always mapped to internal display. | 149 // Internal touchscreen is always mapped to internal display. |
| 150 EXPECT_EQ(2u, displays_[0].touch_device_id()); | 150 EXPECT_EQ(2u, displays_[0].touch_device_id()); |
| 151 EXPECT_EQ(1u, displays_[1].touch_device_id()); | 151 EXPECT_EQ(1u, displays_[1].touch_device_id()); |
| 152 EXPECT_EQ(ui::TouchscreenDevice::kInvalidId, displays_[2].touch_device_id()); | 152 EXPECT_EQ(ui::TouchscreenDevice::kInvalidId, displays_[2].touch_device_id()); |
| 153 EXPECT_EQ(ui::TouchscreenDevice::kInvalidId, displays_[3].touch_device_id()); | 153 EXPECT_EQ(ui::TouchscreenDevice::kInvalidId, displays_[3].touch_device_id()); |
| 154 } | 154 } |
| 155 | 155 |
| 156 } // namespace ash | 156 } // namespace ash |
| OLD | NEW |