| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "ash/display/display_info.h" | |
| 6 | |
| 7 #include <stdio.h> | 5 #include <stdio.h> |
| 8 | |
| 9 #include <algorithm> | |
| 10 #include <string> | 6 #include <string> |
| 11 #include <vector> | 7 #include <vector> |
| 12 | 8 |
| 9 #include "ash/display/display_info.h" |
| 13 #include "base/logging.h" | 10 #include "base/logging.h" |
| 14 #include "base/strings/string_number_conversions.h" | 11 #include "base/strings/string_number_conversions.h" |
| 15 #include "base/strings/string_split.h" | 12 #include "base/strings/string_split.h" |
| 16 #include "base/strings/string_util.h" | 13 #include "base/strings/string_util.h" |
| 17 #include "base/strings/stringprintf.h" | 14 #include "base/strings/stringprintf.h" |
| 18 #include "ui/gfx/display.h" | 15 #include "ui/gfx/display.h" |
| 19 #include "ui/gfx/geometry/size_conversions.h" | 16 #include "ui/gfx/geometry/size_conversions.h" |
| 20 #include "ui/gfx/geometry/size_f.h" | 17 #include "ui/gfx/geometry/size_f.h" |
| 21 | 18 |
| 22 #if defined(OS_WIN) | 19 #if defined(OS_WIN) |
| (...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 449 | 446 |
| 450 void DisplayInfo::ClearInputDevices() { | 447 void DisplayInfo::ClearInputDevices() { |
| 451 input_devices_.clear(); | 448 input_devices_.clear(); |
| 452 } | 449 } |
| 453 | 450 |
| 454 void ResetDisplayIdForTest() { | 451 void ResetDisplayIdForTest() { |
| 455 synthesized_display_id = kSynthesizedDisplayIdStart; | 452 synthesized_display_id = kSynthesizedDisplayIdStart; |
| 456 } | 453 } |
| 457 | 454 |
| 458 } // namespace ash | 455 } // namespace ash |
| OLD | NEW |