| 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_X11_NATIVE_DISPLAY_DELEGATE_X11_H_ | 5 #ifndef UI_DISPLAY_CHROMEOS_X11_NATIVE_DISPLAY_DELEGATE_X11_H_ |
| 6 #define UI_DISPLAY_CHROMEOS_X11_NATIVE_DISPLAY_DELEGATE_X11_H_ | 6 #define UI_DISPLAY_CHROMEOS_X11_NATIVE_DISPLAY_DELEGATE_X11_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <map> | 10 #include <map> |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 133 | 133 |
| 134 // Every time GetOutputs() is called we cache the updated list of outputs in | 134 // Every time GetOutputs() is called we cache the updated list of outputs in |
| 135 // |cached_outputs_| so that we can check for duplicate events rather than | 135 // |cached_outputs_| so that we can check for duplicate events rather than |
| 136 // propagate them. | 136 // propagate them. |
| 137 ScopedVector<DisplaySnapshot> cached_outputs_; | 137 ScopedVector<DisplaySnapshot> cached_outputs_; |
| 138 | 138 |
| 139 scoped_ptr<HelperDelegate> helper_delegate_; | 139 scoped_ptr<HelperDelegate> helper_delegate_; |
| 140 | 140 |
| 141 // Processes X11 display events associated with the root window and notifies | 141 // Processes X11 display events associated with the root window and notifies |
| 142 // |observers_| when a display change has occurred. | 142 // |observers_| when a display change has occurred. |
| 143 scoped_ptr<NativeDisplayEventDispatcherX11> message_pump_dispatcher_; | 143 scoped_ptr<NativeDisplayEventDispatcherX11> platform_event_dispatcher_; |
| 144 | 144 |
| 145 // Processes X11 display events that have no X11 window associated with it. | 145 // Processes X11 display events that have no X11 window associated with it. |
| 146 scoped_ptr<MessagePumpObserverX11> message_pump_observer_; | 146 scoped_ptr<MessagePumpObserverX11> message_pump_observer_; |
| 147 | 147 |
| 148 // List of observers waiting for display configuration change events. | 148 // List of observers waiting for display configuration change events. |
| 149 ObserverList<NativeDisplayObserver> observers_; | 149 ObserverList<NativeDisplayObserver> observers_; |
| 150 | 150 |
| 151 DISALLOW_COPY_AND_ASSIGN(NativeDisplayDelegateX11); | 151 DISALLOW_COPY_AND_ASSIGN(NativeDisplayDelegateX11); |
| 152 }; | 152 }; |
| 153 | 153 |
| 154 } // namespace ui | 154 } // namespace ui |
| 155 | 155 |
| 156 #endif // UI_DISPLAY_CHROMEOS_X11_NATIVE_DISPLAY_DELEGATE_X11_H_ | 156 #endif // UI_DISPLAY_CHROMEOS_X11_NATIVE_DISPLAY_DELEGATE_X11_H_ |
| OLD | NEW |