| 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 <X11/extensions/Xrandr.h> | 5 #include <X11/extensions/Xrandr.h> |
| 6 | 6 |
| 7 #undef Bool | 7 #undef Bool |
| 8 #undef None | 8 #undef None |
| 9 | 9 |
| 10 #include "base/test/simple_test_tick_clock.h" | 10 #include "base/test/simple_test_tick_clock.h" |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 } | 51 } |
| 52 | 52 |
| 53 int num_calls_notify_observers() const { return num_calls_notify_observers_; } | 53 int num_calls_notify_observers() const { return num_calls_notify_observers_; } |
| 54 | 54 |
| 55 void set_cached_outputs(const std::vector<DisplaySnapshot*>& outputs) { | 55 void set_cached_outputs(const std::vector<DisplaySnapshot*>& outputs) { |
| 56 cached_outputs_ = outputs; | 56 cached_outputs_ = outputs; |
| 57 } | 57 } |
| 58 | 58 |
| 59 // NativeDisplayDelegateX11::HelperDelegate overrides: | 59 // NativeDisplayDelegateX11::HelperDelegate overrides: |
| 60 virtual void UpdateXRandRConfiguration(const base::NativeEvent& event) | 60 virtual void UpdateXRandRConfiguration(const base::NativeEvent& event) |
| 61 OVERRIDE; | 61 override; |
| 62 virtual const std::vector<DisplaySnapshot*>& GetCachedDisplays() const | 62 virtual const std::vector<DisplaySnapshot*>& GetCachedDisplays() const |
| 63 OVERRIDE; | 63 override; |
| 64 virtual void NotifyDisplayObservers() OVERRIDE; | 64 virtual void NotifyDisplayObservers() override; |
| 65 | 65 |
| 66 private: | 66 private: |
| 67 int num_calls_update_xrandr_config_; | 67 int num_calls_update_xrandr_config_; |
| 68 int num_calls_notify_observers_; | 68 int num_calls_notify_observers_; |
| 69 | 69 |
| 70 std::vector<DisplaySnapshot*> cached_outputs_; | 70 std::vector<DisplaySnapshot*> cached_outputs_; |
| 71 | 71 |
| 72 DISALLOW_COPY_AND_ASSIGN(TestHelperDelegate); | 72 DISALLOW_COPY_AND_ASSIGN(TestHelperDelegate); |
| 73 }; | 73 }; |
| 74 | 74 |
| (...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 283 DispatchOutputChangeEvent(2, 11, 20, true); | 283 DispatchOutputChangeEvent(2, 11, 20, true); |
| 284 EXPECT_EQ(3, helper_delegate_->num_calls_notify_observers()); | 284 EXPECT_EQ(3, helper_delegate_->num_calls_notify_observers()); |
| 285 | 285 |
| 286 test_tick_clock_->Advance( | 286 test_tick_clock_->Advance( |
| 287 base::TimeDelta::FromMilliseconds(kHalfOfExpirationMs)); | 287 base::TimeDelta::FromMilliseconds(kHalfOfExpirationMs)); |
| 288 DispatchOutputChangeEvent(2, 11, 20, true); | 288 DispatchOutputChangeEvent(2, 11, 20, true); |
| 289 EXPECT_EQ(4, helper_delegate_->num_calls_notify_observers()); | 289 EXPECT_EQ(4, helper_delegate_->num_calls_notify_observers()); |
| 290 } | 290 } |
| 291 | 291 |
| 292 } // namespace ui | 292 } // namespace ui |
| OLD | NEW |