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> |
11 #include <set> | 11 #include <set> |
12 #include <string> | 12 #include <string> |
13 #include <utility> | 13 #include <utility> |
14 #include <vector> | 14 #include <vector> |
15 | 15 |
16 #include "ash/ash_switches.h" | 16 #include "ash/common/ash_switches.h" |
17 #include "ash/display/display_layout_store.h" | 17 #include "ash/display/display_layout_store.h" |
18 #include "ash/display/display_util.h" | 18 #include "ash/display/display_util.h" |
19 #include "ash/display/extended_mouse_warp_controller.h" | 19 #include "ash/display/extended_mouse_warp_controller.h" |
20 #include "ash/display/null_mouse_warp_controller.h" | 20 #include "ash/display/null_mouse_warp_controller.h" |
21 #include "ash/display/screen_ash.h" | 21 #include "ash/display/screen_ash.h" |
22 #include "ash/display/unified_mouse_warp_controller.h" | 22 #include "ash/display/unified_mouse_warp_controller.h" |
23 #include "ash/screen_util.h" | 23 #include "ash/screen_util.h" |
24 #include "ash/shell.h" | 24 #include "ash/shell.h" |
25 #include "base/auto_reset.h" | 25 #include "base/auto_reset.h" |
26 #include "base/command_line.h" | 26 #include "base/command_line.h" |
(...skipping 1311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1338 layout.ApplyToDisplayList(display_list, updated_ids, | 1338 layout.ApplyToDisplayList(display_list, updated_ids, |
1339 kMinimumOverlapForInvalidOffset); | 1339 kMinimumOverlapForInvalidOffset); |
1340 } | 1340 } |
1341 | 1341 |
1342 void DisplayManager::RunPendingTasksForTest() { | 1342 void DisplayManager::RunPendingTasksForTest() { |
1343 if (!software_mirroring_display_list_.empty()) | 1343 if (!software_mirroring_display_list_.empty()) |
1344 base::RunLoop().RunUntilIdle(); | 1344 base::RunLoop().RunUntilIdle(); |
1345 } | 1345 } |
1346 | 1346 |
1347 } // namespace ash | 1347 } // namespace ash |
OLD | NEW |