| 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 #include <stdint.h> | 5 #include <stdint.h> |
| 6 #include <X11/extensions/Xrandr.h> | 6 #include <X11/extensions/Xrandr.h> |
| 7 | 7 |
| 8 #undef Bool | 8 #undef Bool |
| 9 #undef None | 9 #undef None |
| 10 | 10 |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 | 29 |
| 30 DisplaySnapshotX11* snapshot = new DisplaySnapshotX11( | 30 DisplaySnapshotX11* snapshot = new DisplaySnapshotX11( |
| 31 id, | 31 id, |
| 32 gfx::Point(0, 0), | 32 gfx::Point(0, 0), |
| 33 gfx::Size(0, 0), | 33 gfx::Size(0, 0), |
| 34 type, | 34 type, |
| 35 false, | 35 false, |
| 36 false, | 36 false, |
| 37 std::string(), | 37 std::string(), |
| 38 std::vector<const DisplayMode*>(1, kDefaultDisplayMode), | 38 std::vector<const DisplayMode*>(1, kDefaultDisplayMode), |
| 39 std::vector<uint8_t>(), | |
| 40 kDefaultDisplayMode, | 39 kDefaultDisplayMode, |
| 41 NULL, | 40 NULL, |
| 42 output, | 41 output, |
| 43 crtc, | 42 crtc, |
| 44 0); | 43 0); |
| 45 | 44 |
| 46 return snapshot; | 45 return snapshot; |
| 47 } | 46 } |
| 48 | 47 |
| 49 DisplaySnapshotX11* CreateExternalOutput(RROutput output, RRCrtc crtc) { | 48 DisplaySnapshotX11* CreateExternalOutput(RROutput output, RRCrtc crtc) { |
| (...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 321 outputs.clear(); | 320 outputs.clear(); |
| 322 outputs.push_back(CreateOutput(0, DISPLAY_CONNECTION_TYPE_UNKNOWN, 2, 11)); | 321 outputs.push_back(CreateOutput(0, DISPLAY_CONNECTION_TYPE_UNKNOWN, 2, 11)); |
| 323 helper_delegate_->set_cached_outputs(outputs.get()); | 322 helper_delegate_->set_cached_outputs(outputs.get()); |
| 324 | 323 |
| 325 // External display should be updated if the id is zero. | 324 // External display should be updated if the id is zero. |
| 326 DispatchOutputChangeEvent(2, 11, 20, true); | 325 DispatchOutputChangeEvent(2, 11, 20, true); |
| 327 EXPECT_EQ(1, helper_delegate_->num_calls_notify_observers()); | 326 EXPECT_EQ(1, helper_delegate_->num_calls_notify_observers()); |
| 328 } | 327 } |
| 329 | 328 |
| 330 } // namespace ui | 329 } // namespace ui |
| OLD | NEW |