| 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> |
| 11 #include <vector> | 11 #include <vector> |
| 12 | 12 |
| 13 #include "base/compiler_specific.h" | 13 #include "base/compiler_specific.h" |
| 14 #include "base/event_types.h" | 14 #include "base/event_types.h" |
| 15 #include "base/memory/scoped_ptr.h" | 15 #include "base/memory/scoped_ptr.h" |
| 16 #include "base/memory/scoped_vector.h" | 16 #include "base/memory/scoped_vector.h" |
| 17 #include "base/observer_list.h" | 17 #include "base/observer_list.h" |
| 18 #include "ui/display/chromeos/native_display_delegate.h" | 18 #include "ui/display/display_export.h" |
| 19 #include "ui/display/types/chromeos/native_display_delegate.h" |
| 19 #include "ui/gfx/geometry/point.h" | 20 #include "ui/gfx/geometry/point.h" |
| 20 #include "ui/gfx/geometry/size.h" | 21 #include "ui/gfx/geometry/size.h" |
| 21 | 22 |
| 22 // Forward declarations for Xlib and Xrandr. | 23 // Forward declarations for Xlib and Xrandr. |
| 23 // This is so unused X definitions don't pollute the namespace. | 24 // This is so unused X definitions don't pollute the namespace. |
| 24 typedef unsigned long XID; | 25 typedef unsigned long XID; |
| 25 typedef XID RROutput; | 26 typedef XID RROutput; |
| 26 typedef XID RRCrtc; | 27 typedef XID RRCrtc; |
| 27 typedef XID RRMode; | 28 typedef XID RRMode; |
| 28 typedef XID Window; | 29 typedef XID Window; |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 | 148 |
| 148 // List of observers waiting for display configuration change events. | 149 // List of observers waiting for display configuration change events. |
| 149 ObserverList<NativeDisplayObserver> observers_; | 150 ObserverList<NativeDisplayObserver> observers_; |
| 150 | 151 |
| 151 DISALLOW_COPY_AND_ASSIGN(NativeDisplayDelegateX11); | 152 DISALLOW_COPY_AND_ASSIGN(NativeDisplayDelegateX11); |
| 152 }; | 153 }; |
| 153 | 154 |
| 154 } // namespace ui | 155 } // namespace ui |
| 155 | 156 |
| 156 #endif // UI_DISPLAY_CHROMEOS_X11_NATIVE_DISPLAY_DELEGATE_X11_H_ | 157 #endif // UI_DISPLAY_CHROMEOS_X11_NATIVE_DISPLAY_DELEGATE_X11_H_ |
| OLD | NEW |