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/test/display_manager_test_api.h" | 5 #include "ash/test/display_manager_test_api.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "ash/display/display_info.h" | 9 #include "ash/display/display_info.h" |
10 #include "ash/display/display_manager.h" | 10 #include "ash/display/display_manager.h" |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
78 } | 78 } |
79 } | 79 } |
80 | 80 |
81 display_manager_->OnNativeDisplaysChanged(display_info_list); | 81 display_manager_->OnNativeDisplaysChanged(display_info_list); |
82 } | 82 } |
83 | 83 |
84 int64 DisplayManagerTestApi::SetFirstDisplayAsInternalDisplay() { | 84 int64 DisplayManagerTestApi::SetFirstDisplayAsInternalDisplay() { |
85 const gfx::Display& internal = display_manager_->displays_[0]; | 85 const gfx::Display& internal = display_manager_->displays_[0]; |
86 gfx::Display::SetInternalDisplayId(internal.id()); | 86 gfx::Display::SetInternalDisplayId(internal.id()); |
87 display_manager_->internal_display_info_.reset(new DisplayInfo( | 87 display_manager_->internal_display_info_.reset(new DisplayInfo( |
88 display_manager_->GetDisplayInfo(internal))); | 88 display_manager_->GetDisplayInfo(internal.id()))); |
89 return gfx::Display::InternalDisplayId(); | 89 return gfx::Display::InternalDisplayId(); |
90 } | 90 } |
91 | 91 |
92 void DisplayManagerTestApi::DisableChangeDisplayUponHostResize() { | 92 void DisplayManagerTestApi::DisableChangeDisplayUponHostResize() { |
93 display_manager_->set_change_display_upon_host_resize(false); | 93 display_manager_->set_change_display_upon_host_resize(false); |
94 } | 94 } |
95 | 95 |
96 } // namespace test | 96 } // namespace test |
97 } // namespace ash | 97 } // namespace ash |
OLD | NEW |