OLD | NEW |
---|---|
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "ash/display/display_change_observer_chromeos.h" | 5 #include "ash/display/display_change_observer_chromeos.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <map> | 8 #include <map> |
9 #include <set> | 9 #include <set> |
10 #include <vector> | 10 #include <vector> |
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
163 ids.insert(id); | 163 ids.insert(id); |
164 | 164 |
165 displays.push_back(DisplayInfo(id, name, has_overscan)); | 165 displays.push_back(DisplayInfo(id, name, has_overscan)); |
166 displays.back().set_device_scale_factor(device_scale_factor); | 166 displays.back().set_device_scale_factor(device_scale_factor); |
167 displays.back().SetBounds(display_bounds); | 167 displays.back().SetBounds(display_bounds); |
168 displays.back().set_native(true); | 168 displays.back().set_native(true); |
169 displays.back().set_display_modes(display_modes); | 169 displays.back().set_display_modes(display_modes); |
170 displays.back().set_touch_support( | 170 displays.back().set_touch_support( |
171 output.touch_device_id == 0 ? gfx::Display::TOUCH_SUPPORT_UNAVAILABLE : | 171 output.touch_device_id == 0 ? gfx::Display::TOUCH_SUPPORT_UNAVAILABLE : |
172 gfx::Display::TOUCH_SUPPORT_AVAILABLE); | 172 gfx::Display::TOUCH_SUPPORT_AVAILABLE); |
173 displays.back().set_touch_device_id(output.touch_device_id); | |
sadrul
2014/03/15 19:32:51
Can this block be like:
DisplayInfo display(id,
Yufeng Shen (Slow to review)
2014/04/29 20:34:18
seems that it is already reworked this way.
| |
173 } | 174 } |
174 | 175 |
175 // DisplayManager can be null during the boot. | 176 // DisplayManager can be null during the boot. |
176 Shell::GetInstance()->display_manager()->OnNativeDisplaysChanged(displays); | 177 Shell::GetInstance()->display_manager()->OnNativeDisplaysChanged(displays); |
177 } | 178 } |
178 | 179 |
179 void DisplayChangeObserver::OnAppTerminating() { | 180 void DisplayChangeObserver::OnAppTerminating() { |
180 #if defined(USE_ASH) | 181 #if defined(USE_ASH) |
181 // Stop handling display configuration events once the shutdown | 182 // Stop handling display configuration events once the shutdown |
182 // process starts. crbug.com/177014. | 183 // process starts. crbug.com/177014. |
183 Shell::GetInstance()->output_configurator()->PrepareForExit(); | 184 Shell::GetInstance()->output_configurator()->PrepareForExit(); |
184 #endif | 185 #endif |
185 } | 186 } |
186 | 187 |
187 } // namespace internal | 188 } // namespace internal |
188 } // namespace ash | 189 } // namespace ash |
OLD | NEW |