| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 <stdio.h> | 5 #include <stdio.h> |
| 6 #include <string> | 6 #include <string> |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "ash/display/display_info.h" | 9 #include "ash/display/display_info.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 // Default bounds for a display. | 39 // Default bounds for a display. |
| 40 const int kDefaultHostWindowX = 200; | 40 const int kDefaultHostWindowX = 200; |
| 41 const int kDefaultHostWindowY = 200; | 41 const int kDefaultHostWindowY = 200; |
| 42 const int kDefaultHostWindowWidth = 1366; | 42 const int kDefaultHostWindowWidth = 1366; |
| 43 const int kDefaultHostWindowHeight = 768; | 43 const int kDefaultHostWindowHeight = 768; |
| 44 | 44 |
| 45 // Use larger than max int to catch overflow early. | 45 // Use larger than max int to catch overflow early. |
| 46 static int64 synthesized_display_id = 2200000000LL; | 46 static int64 synthesized_display_id = 2200000000LL; |
| 47 | 47 |
| 48 #if defined(OS_WIN) | 48 #if defined(OS_WIN) |
| 49 gfx::Rect bounds_in_native(aura::RootWindowHost::GetNativeScreenSize()); | 49 gfx::Rect bounds_in_native(aura::WindowTreeHost::GetNativeScreenSize()); |
| 50 #else | 50 #else |
| 51 gfx::Rect bounds_in_native(kDefaultHostWindowX, kDefaultHostWindowY, | 51 gfx::Rect bounds_in_native(kDefaultHostWindowX, kDefaultHostWindowY, |
| 52 kDefaultHostWindowWidth, kDefaultHostWindowHeight); | 52 kDefaultHostWindowWidth, kDefaultHostWindowHeight); |
| 53 #endif | 53 #endif |
| 54 std::string main_spec = spec; | 54 std::string main_spec = spec; |
| 55 | 55 |
| 56 float ui_scale = 1.0f; | 56 float ui_scale = 1.0f; |
| 57 std::vector<std::string> parts; | 57 std::vector<std::string> parts; |
| 58 if (Tokenize(main_spec, "@", &parts) == 2) { | 58 if (Tokenize(main_spec, "@", &parts) == 2) { |
| 59 double scale_in_double = 0; | 59 double scale_in_double = 0; |
| (...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 262 resolutions_str += ","; | 262 resolutions_str += ","; |
| 263 resolutions_str += iter->size.ToString(); | 263 resolutions_str += iter->size.ToString(); |
| 264 if (iter->interlaced) | 264 if (iter->interlaced) |
| 265 resolutions_str += "(i)"; | 265 resolutions_str += "(i)"; |
| 266 } | 266 } |
| 267 return ToString() + ", resolutions=" + resolutions_str; | 267 return ToString() + ", resolutions=" + resolutions_str; |
| 268 } | 268 } |
| 269 | 269 |
| 270 } // namespace internal | 270 } // namespace internal |
| 271 } // namespace ash | 271 } // namespace ash |
| OLD | NEW |