| 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 <set> |    7 #include <set> | 
|    8  |    8  | 
|    9 #include "base/files/file_util.h" |    9 #include "base/files/file_util.h" | 
|   10 #include "base/logging.h" |   10 #include "base/logging.h" | 
|   11 #include "base/strings/string_util.h" |   11 #include "base/strings/string_util.h" | 
|   12 #include "ui/events/devices/input_device.h" |   12 #include "ui/events/devices/input_device.h" | 
|   13  |   13  | 
|   14 namespace display { |   14 namespace display { | 
|   15  |   15  | 
| (...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  275   AssociateSameSizeDevices(&displays, &devices); |  275   AssociateSameSizeDevices(&displays, &devices); | 
|  276   AssociateToSingleDisplay(&displays, &devices); |  276   AssociateToSingleDisplay(&displays, &devices); | 
|  277  |  277  | 
|  278   for (const ManagedDisplayInfo* display : displays) |  278   for (const ManagedDisplayInfo* display : displays) | 
|  279     LOG(WARNING) << "Unmatched display " << display->name(); |  279     LOG(WARNING) << "Unmatched display " << display->name(); | 
|  280   for (const ui::TouchscreenDevice* device : devices) |  280   for (const ui::TouchscreenDevice* device : devices) | 
|  281     LOG(WARNING) << "Unmatched device " << device->name; |  281     LOG(WARNING) << "Unmatched device " << device->name; | 
|  282 } |  282 } | 
|  283  |  283  | 
|  284 }  // namespace display |  284 }  // namespace display | 
| OLD | NEW |