| 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 #ifndef ASH_DISPLAY_DISPLAY_MANAGER_H_ | 5 #ifndef ASH_DISPLAY_DISPLAY_MANAGER_H_ |
| 6 #define ASH_DISPLAY_DISPLAY_MANAGER_H_ | 6 #define ASH_DISPLAY_DISPLAY_MANAGER_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 320 // List of current active displays. | 320 // List of current active displays. |
| 321 DisplayList displays_; | 321 DisplayList displays_; |
| 322 | 322 |
| 323 int num_connected_displays_; | 323 int num_connected_displays_; |
| 324 | 324 |
| 325 bool force_bounds_changed_; | 325 bool force_bounds_changed_; |
| 326 | 326 |
| 327 // The mapping from the display ID to its internal data. | 327 // The mapping from the display ID to its internal data. |
| 328 std::map<int64, DisplayInfo> display_info_; | 328 std::map<int64, DisplayInfo> display_info_; |
| 329 | 329 |
| 330 // Selected resolutions for displays. Key is the displays' ID. | 330 // Selected resolutions in pixels for displays. Key is the displays' ID. |
| 331 std::map<int64, gfx::Size> resolutions_; | 331 std::map<int64, gfx::Size> resolutions_; |
| 332 | 332 |
| 333 // When set to true, the host window's resize event updates | 333 // When set to true, the host window's resize event updates |
| 334 // the display's size. This is set to true when running on | 334 // the display's size. This is set to true when running on |
| 335 // desktop environment (for debugging) so that resizing the host | 335 // desktop environment (for debugging) so that resizing the host |
| 336 // window will update the display properly. This is set to false | 336 // window will update the display properly. This is set to false |
| 337 // on device as well as during the unit tests. | 337 // on device as well as during the unit tests. |
| 338 bool change_display_upon_host_resize_; | 338 bool change_display_upon_host_resize_; |
| 339 | 339 |
| 340 SecondDisplayMode second_display_mode_; | 340 SecondDisplayMode second_display_mode_; |
| 341 int64 mirrored_display_id_; | 341 int64 mirrored_display_id_; |
| 342 gfx::Display non_desktop_display_; | 342 gfx::Display non_desktop_display_; |
| 343 | 343 |
| 344 DISALLOW_COPY_AND_ASSIGN(DisplayManager); | 344 DISALLOW_COPY_AND_ASSIGN(DisplayManager); |
| 345 }; | 345 }; |
| 346 | 346 |
| 347 } // namespace internal | 347 } // namespace internal |
| 348 } // namespace ash | 348 } // namespace ash |
| 349 | 349 |
| 350 #endif // ASH_DISPLAY_DISPLAY_MANAGER_H_ | 350 #endif // ASH_DISPLAY_DISPLAY_MANAGER_H_ |
| OLD | NEW |