| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 UI_DISPLAY_CHROMEOS_UPDATE_DISPLAY_CONFIGURATION_TASK_H_ | 5 #ifndef UI_DISPLAY_CHROMEOS_UPDATE_DISPLAY_CONFIGURATION_TASK_H_ |
| 6 #define UI_DISPLAY_CHROMEOS_UPDATE_DISPLAY_CONFIGURATION_TASK_H_ | 6 #define UI_DISPLAY_CHROMEOS_UPDATE_DISPLAY_CONFIGURATION_TASK_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 99 bool force_dpms_; | 99 bool force_dpms_; |
| 100 | 100 |
| 101 // List of updated displays. | 101 // List of updated displays. |
| 102 std::vector<DisplaySnapshot*> cached_displays_; | 102 std::vector<DisplaySnapshot*> cached_displays_; |
| 103 | 103 |
| 104 // Vector of unowned VirtualDisplaySnapshots to be added when doing the task. | 104 // Vector of unowned VirtualDisplaySnapshots to be added when doing the task. |
| 105 std::vector<DisplaySnapshot*> virtual_display_snapshots_; | 105 std::vector<DisplaySnapshot*> virtual_display_snapshots_; |
| 106 | 106 |
| 107 gfx::Size framebuffer_size_; | 107 gfx::Size framebuffer_size_; |
| 108 | 108 |
| 109 scoped_ptr<ConfigureDisplaysTask> configure_task_; | 109 std::unique_ptr<ConfigureDisplaysTask> configure_task_; |
| 110 | 110 |
| 111 base::WeakPtrFactory<UpdateDisplayConfigurationTask> weak_ptr_factory_; | 111 base::WeakPtrFactory<UpdateDisplayConfigurationTask> weak_ptr_factory_; |
| 112 | 112 |
| 113 DISALLOW_COPY_AND_ASSIGN(UpdateDisplayConfigurationTask); | 113 DISALLOW_COPY_AND_ASSIGN(UpdateDisplayConfigurationTask); |
| 114 }; | 114 }; |
| 115 | 115 |
| 116 } // namespace ui | 116 } // namespace ui |
| 117 | 117 |
| 118 #endif // UI_DISPLAY_CHROMEOS_UPDATE_DISPLAY_CONFIGURATION_TASK_H_ | 118 #endif // UI_DISPLAY_CHROMEOS_UPDATE_DISPLAY_CONFIGURATION_TASK_H_ |
| OLD | NEW |