Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(80)

Side by Side Diff: ui/display/chromeos/x11/native_display_delegate_x11.h

Issue 336863002: Moving input device hotplug event processing outside of ui/display (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 23 matching lines...) Expand all
34 typedef _XRROutputInfo XRROutputInfo; 34 typedef _XRROutputInfo XRROutputInfo;
35 struct _XRRScreenResources; 35 struct _XRRScreenResources;
36 typedef _XRRScreenResources XRRScreenResources; 36 typedef _XRRScreenResources XRRScreenResources;
37 struct _XRRCrtcGamma; 37 struct _XRRCrtcGamma;
38 typedef _XRRCrtcGamma XRRCrtcGamma; 38 typedef _XRRCrtcGamma XRRCrtcGamma;
39 39
40 namespace ui { 40 namespace ui {
41 41
42 class DisplayModeX11; 42 class DisplayModeX11;
43 class DisplaySnapshotX11; 43 class DisplaySnapshotX11;
44 class InputDeviceEventObserver;
45 class NativeDisplayEventDispatcherX11; 44 class NativeDisplayEventDispatcherX11;
46 45
47 class DISPLAY_EXPORT NativeDisplayDelegateX11 : public NativeDisplayDelegate { 46 class DISPLAY_EXPORT NativeDisplayDelegateX11 : public NativeDisplayDelegate {
48 public: 47 public:
49 // Helper class that allows NativeDisplayEventDispatcherX11 and 48 // Helper class that allows NativeDisplayEventDispatcherX11 and
50 // NativeDisplayDelegateX11::PlatformEventObserverX11 to interact with this 49 // NativeDisplayDelegateX11::PlatformEventObserverX11 to interact with this
51 // class or with mocks in tests. 50 // class or with mocks in tests.
52 class HelperDelegate { 51 class HelperDelegate {
53 public: 52 public:
54 virtual ~HelperDelegate() {} 53 virtual ~HelperDelegate() {}
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 // |cached_outputs_| so that we can check for duplicate events rather than 141 // |cached_outputs_| so that we can check for duplicate events rather than
143 // propagate them. 142 // propagate them.
144 ScopedVector<DisplaySnapshot> cached_outputs_; 143 ScopedVector<DisplaySnapshot> cached_outputs_;
145 144
146 scoped_ptr<HelperDelegate> helper_delegate_; 145 scoped_ptr<HelperDelegate> helper_delegate_;
147 146
148 // Processes X11 display events associated with the root window and notifies 147 // Processes X11 display events associated with the root window and notifies
149 // |observers_| when a display change has occurred. 148 // |observers_| when a display change has occurred.
150 scoped_ptr<NativeDisplayEventDispatcherX11> platform_event_dispatcher_; 149 scoped_ptr<NativeDisplayEventDispatcherX11> platform_event_dispatcher_;
151 150
152 // Processes X11 display events that have no X11 window associated with it.
153 scoped_ptr<InputDeviceEventObserver> input_hotplug_observer_;
154
155 // List of observers waiting for display configuration change events. 151 // List of observers waiting for display configuration change events.
156 ObserverList<NativeDisplayObserver> observers_; 152 ObserverList<NativeDisplayObserver> observers_;
157 153
158 // A background color used during boot time + multi displays. 154 // A background color used during boot time + multi displays.
159 uint32_t background_color_argb_; 155 uint32_t background_color_argb_;
160 156
161 DISALLOW_COPY_AND_ASSIGN(NativeDisplayDelegateX11); 157 DISALLOW_COPY_AND_ASSIGN(NativeDisplayDelegateX11);
162 }; 158 };
163 159
164 } // namespace ui 160 } // namespace ui
165 161
166 #endif // UI_DISPLAY_CHROMEOS_X11_NATIVE_DISPLAY_DELEGATE_X11_H_ 162 #endif // UI_DISPLAY_CHROMEOS_X11_NATIVE_DISPLAY_DELEGATE_X11_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698