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 18 matching lines...) Expand all Loading... |
29 #include "ui/gfx/display.h" | 29 #include "ui/gfx/display.h" |
30 #include "ui/gfx/rect.h" | 30 #include "ui/gfx/rect.h" |
31 #include "ui/gfx/screen.h" | 31 #include "ui/gfx/screen.h" |
32 #include "ui/gfx/size_conversions.h" | 32 #include "ui/gfx/size_conversions.h" |
33 | 33 |
34 #if defined(USE_X11) | 34 #if defined(USE_X11) |
35 #include "ui/base/x/x11_util.h" | 35 #include "ui/base/x/x11_util.h" |
36 #endif | 36 #endif |
37 | 37 |
38 #if defined(OS_CHROMEOS) | 38 #if defined(OS_CHROMEOS) |
39 #include "ash/display/output_configurator_animation.h" | 39 #include "ash/display/display_configurator_animation.h" |
40 #include "base/sys_info.h" | 40 #include "base/sys_info.h" |
41 #endif | 41 #endif |
42 | 42 |
43 #if defined(OS_WIN) | 43 #if defined(OS_WIN) |
44 #include "base/win/windows_version.h" | 44 #include "base/win/windows_version.h" |
45 #endif | 45 #endif |
46 | 46 |
47 namespace ash { | 47 namespace ash { |
48 typedef std::vector<gfx::Display> DisplayList; | 48 typedef std::vector<gfx::Display> DisplayList; |
49 typedef std::vector<DisplayInfo> DisplayInfoList; | 49 typedef std::vector<DisplayInfo> DisplayInfoList; |
(...skipping 831 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
881 SetSecondDisplayMode(mirrored ? MIRRORING : EXTENDED); | 881 SetSecondDisplayMode(mirrored ? MIRRORING : EXTENDED); |
882 DisplayInfoList display_info_list; | 882 DisplayInfoList display_info_list; |
883 int count = 0; | 883 int count = 0; |
884 for (std::map<int64, DisplayInfo>::const_iterator iter = | 884 for (std::map<int64, DisplayInfo>::const_iterator iter = |
885 display_info_.begin(); | 885 display_info_.begin(); |
886 count < 2; ++iter, ++count) { | 886 count < 2; ++iter, ++count) { |
887 display_info_list.push_back(GetDisplayInfo(iter->second.id())); | 887 display_info_list.push_back(GetDisplayInfo(iter->second.id())); |
888 } | 888 } |
889 UpdateDisplays(display_info_list); | 889 UpdateDisplays(display_info_list); |
890 #if defined(OS_CHROMEOS) | 890 #if defined(OS_CHROMEOS) |
891 if (Shell::GetInstance()->output_configurator_animation()) { | 891 if (Shell::GetInstance()->display_configurator_animation()) { |
892 Shell::GetInstance()->output_configurator_animation()-> | 892 Shell::GetInstance()->display_configurator_animation()-> |
893 StartFadeInAnimation(); | 893 StartFadeInAnimation(); |
894 } | 894 } |
895 #endif | 895 #endif |
896 } | 896 } |
897 | 897 |
898 void DisplayManager::AddRemoveDisplay() { | 898 void DisplayManager::AddRemoveDisplay() { |
899 DCHECK(!displays_.empty()); | 899 DCHECK(!displays_.empty()); |
900 std::vector<DisplayInfo> new_display_info_list; | 900 std::vector<DisplayInfo> new_display_info_list; |
901 const DisplayInfo& first_display = GetDisplayInfo(displays_[0].id()); | 901 const DisplayInfo& first_display = GetDisplayInfo(displays_[0].id()); |
902 new_display_info_list.push_back(first_display); | 902 new_display_info_list.push_back(first_display); |
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1115 new_secondary_origin.Offset(-secondary_bounds.width(), offset); | 1115 new_secondary_origin.Offset(-secondary_bounds.width(), offset); |
1116 break; | 1116 break; |
1117 } | 1117 } |
1118 gfx::Insets insets = secondary_display->GetWorkAreaInsets(); | 1118 gfx::Insets insets = secondary_display->GetWorkAreaInsets(); |
1119 secondary_display->set_bounds( | 1119 secondary_display->set_bounds( |
1120 gfx::Rect(new_secondary_origin, secondary_bounds.size())); | 1120 gfx::Rect(new_secondary_origin, secondary_bounds.size())); |
1121 secondary_display->UpdateWorkAreaFromInsets(insets); | 1121 secondary_display->UpdateWorkAreaFromInsets(insets); |
1122 } | 1122 } |
1123 | 1123 |
1124 } // namespace ash | 1124 } // namespace ash |
OLD | NEW |