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 <cmath> | 7 #include <cmath> |
8 #include <set> | 8 #include <set> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 25 matching lines...) Expand all Loading... |
36 #if defined(OS_CHROMEOS) | 36 #if defined(OS_CHROMEOS) |
37 #include "ash/display/output_configurator_animation.h" | 37 #include "ash/display/output_configurator_animation.h" |
38 #include "base/sys_info.h" | 38 #include "base/sys_info.h" |
39 #endif | 39 #endif |
40 | 40 |
41 #if defined(OS_WIN) | 41 #if defined(OS_WIN) |
42 #include "base/win/windows_version.h" | 42 #include "base/win/windows_version.h" |
43 #endif | 43 #endif |
44 | 44 |
45 namespace ash { | 45 namespace ash { |
46 namespace internal { | |
47 typedef std::vector<gfx::Display> DisplayList; | 46 typedef std::vector<gfx::Display> DisplayList; |
48 typedef std::vector<DisplayInfo> DisplayInfoList; | 47 typedef std::vector<DisplayInfo> DisplayInfoList; |
49 | 48 |
50 namespace { | 49 namespace { |
51 | 50 |
52 // We need to keep this in order for unittests to tell if | 51 // We need to keep this in order for unittests to tell if |
53 // the object in gfx::Screen::GetScreenByType is for shutdown. | 52 // the object in gfx::Screen::GetScreenByType is for shutdown. |
54 gfx::Screen* screen_for_shutdown = NULL; | 53 gfx::Screen* screen_for_shutdown = NULL; |
55 | 54 |
56 // The number of pixels to overlap between the primary and secondary displays, | 55 // The number of pixels to overlap between the primary and secondary displays, |
(...skipping 1053 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1110 case DisplayLayout::LEFT: | 1109 case DisplayLayout::LEFT: |
1111 new_secondary_origin.Offset(-secondary_bounds.width(), offset); | 1110 new_secondary_origin.Offset(-secondary_bounds.width(), offset); |
1112 break; | 1111 break; |
1113 } | 1112 } |
1114 gfx::Insets insets = secondary_display->GetWorkAreaInsets(); | 1113 gfx::Insets insets = secondary_display->GetWorkAreaInsets(); |
1115 secondary_display->set_bounds( | 1114 secondary_display->set_bounds( |
1116 gfx::Rect(new_secondary_origin, secondary_bounds.size())); | 1115 gfx::Rect(new_secondary_origin, secondary_bounds.size())); |
1117 secondary_display->UpdateWorkAreaFromInsets(insets); | 1116 secondary_display->UpdateWorkAreaFromInsets(insets); |
1118 } | 1117 } |
1119 | 1118 |
1120 } // namespace internal | |
1121 } // namespace ash | 1119 } // namespace ash |
OLD | NEW |