| 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 "ui/display/chromeos/touchscreen_util.h" |    5 #include "ui/display/manager/chromeos/touchscreen_util.h" | 
|    6  |    6  | 
|    7 #include <memory> |    7 #include <memory> | 
|    8 #include <string> |    8 #include <string> | 
|    9 #include <vector> |    9 #include <vector> | 
|   10  |   10  | 
|   11 #include "base/memory/ptr_util.h" |   11 #include "base/memory/ptr_util.h" | 
|   12 #include "testing/gtest/include/gtest/gtest.h" |   12 #include "testing/gtest/include/gtest/gtest.h" | 
|   13 #include "ui/display/manager/display_manager.h" |   13 #include "ui/display/manager/display_manager.h" | 
|   14 #include "ui/display/manager/managed_display_info.h" |   14 #include "ui/display/manager/managed_display_info.h" | 
|   15 #include "ui/display/screen_base.h" |   15 #include "ui/display/screen_base.h" | 
| (...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  283   AssociateTouchscreens(&displays_, devices); |  283   AssociateTouchscreens(&displays_, devices); | 
|  284  |  284  | 
|  285   EXPECT_EQ(1u, displays_[0].input_devices().size()); |  285   EXPECT_EQ(1u, displays_[0].input_devices().size()); | 
|  286   EXPECT_EQ(1, displays_[0].input_devices()[0]); |  286   EXPECT_EQ(1, displays_[0].input_devices()[0]); | 
|  287   EXPECT_EQ(0u, displays_[1].input_devices().size()); |  287   EXPECT_EQ(0u, displays_[1].input_devices().size()); | 
|  288   EXPECT_EQ(0u, displays_[2].input_devices().size()); |  288   EXPECT_EQ(0u, displays_[2].input_devices().size()); | 
|  289   EXPECT_EQ(0u, displays_[3].input_devices().size()); |  289   EXPECT_EQ(0u, displays_[3].input_devices().size()); | 
|  290 } |  290 } | 
|  291  |  291  | 
|  292 }  // namespace display |  292 }  // namespace display | 
| OLD | NEW |