| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_manager.h" | 5 #include "ash/display/display_manager.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <cmath> | 8 #include <cmath> |
| 9 #include <limits> | 9 #include <limits> |
| 10 #include <map> | 10 #include <map> |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 #include "base/auto_reset.h" | 25 #include "base/auto_reset.h" |
| 26 #include "base/command_line.h" | 26 #include "base/command_line.h" |
| 27 #include "base/logging.h" | 27 #include "base/logging.h" |
| 28 #include "base/memory/ptr_util.h" | 28 #include "base/memory/ptr_util.h" |
| 29 #include "base/metrics/histogram.h" | 29 #include "base/metrics/histogram.h" |
| 30 #include "base/run_loop.h" | 30 #include "base/run_loop.h" |
| 31 #include "base/strings/string_number_conversions.h" | 31 #include "base/strings/string_number_conversions.h" |
| 32 #include "base/strings/string_split.h" | 32 #include "base/strings/string_split.h" |
| 33 #include "base/strings/stringprintf.h" | 33 #include "base/strings/stringprintf.h" |
| 34 #include "base/strings/utf_string_conversions.h" | 34 #include "base/strings/utf_string_conversions.h" |
| 35 #include "base/thread_task_runner_handle.h" | 35 #include "base/threading/thread_task_runner_handle.h" |
| 36 #include "grit/ash_strings.h" | 36 #include "grit/ash_strings.h" |
| 37 #include "ui/base/l10n/l10n_util.h" | 37 #include "ui/base/l10n/l10n_util.h" |
| 38 #include "ui/display/display.h" | 38 #include "ui/display/display.h" |
| 39 #include "ui/display/display_observer.h" | 39 #include "ui/display/display_observer.h" |
| 40 #include "ui/display/screen.h" | 40 #include "ui/display/screen.h" |
| 41 #include "ui/gfx/font_render_params.h" | 41 #include "ui/gfx/font_render_params.h" |
| 42 #include "ui/gfx/geometry/rect.h" | 42 #include "ui/gfx/geometry/rect.h" |
| 43 #include "ui/gfx/geometry/size_conversions.h" | 43 #include "ui/gfx/geometry/size_conversions.h" |
| 44 | 44 |
| 45 #if defined(USE_X11) | 45 #if defined(USE_X11) |
| (...skipping 1283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1329 layout.ApplyToDisplayList(display_list, updated_ids, | 1329 layout.ApplyToDisplayList(display_list, updated_ids, |
| 1330 kMinimumOverlapForInvalidOffset); | 1330 kMinimumOverlapForInvalidOffset); |
| 1331 } | 1331 } |
| 1332 | 1332 |
| 1333 void DisplayManager::RunPendingTasksForTest() { | 1333 void DisplayManager::RunPendingTasksForTest() { |
| 1334 if (!software_mirroring_display_list_.empty()) | 1334 if (!software_mirroring_display_list_.empty()) |
| 1335 base::RunLoop().RunUntilIdle(); | 1335 base::RunLoop().RunUntilIdle(); |
| 1336 } | 1336 } |
| 1337 | 1337 |
| 1338 } // namespace ash | 1338 } // namespace ash |
| OLD | NEW |