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" |
11 #include "ash/shell.h" | 11 #include "ash/shell.h" |
12 #include "base/string_split.h" | 12 #include "base/strings/string_split.h" |
13 #include "ui/aura/root_window.h" | 13 #include "ui/aura/root_window.h" |
14 #include "ui/gfx/display.h" | 14 #include "ui/gfx/display.h" |
15 | 15 |
16 namespace ash { | 16 namespace ash { |
17 namespace test { | 17 namespace test { |
18 typedef std::vector<gfx::Display> DisplayList; | 18 typedef std::vector<gfx::Display> DisplayList; |
19 typedef internal::DisplayInfo DisplayInfo; | 19 typedef internal::DisplayInfo DisplayInfo; |
20 typedef std::vector<DisplayInfo> DisplayInfoList; | 20 typedef std::vector<DisplayInfo> DisplayInfoList; |
21 | 21 |
22 namespace { | 22 namespace { |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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))); |
89 return gfx::Display::InternalDisplayId(); | 89 return gfx::Display::InternalDisplayId(); |
90 } | 90 } |
91 | 91 |
92 } // namespace test | 92 } // namespace test |
93 } // namespace ash | 93 } // namespace ash |
OLD | NEW |