diff options
Diffstat (limited to 'ui/display/chromeos')
| -rw-r--r-- | ui/display/chromeos/display_configurator.h | 2 | ||||
| -rw-r--r-- | ui/display/chromeos/x11/native_display_delegate_x11.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ui/display/chromeos/display_configurator.h b/ui/display/chromeos/display_configurator.h index d185301..5564aa3 100644 --- a/ui/display/chromeos/display_configurator.h +++ b/ui/display/chromeos/display_configurator.h @@ -398,7 +398,7 @@ class DISPLAY_EXPORT DisplayConfigurator : public NativeDisplayObserver { // Most-recently-used framebuffer size. gfx::Size framebuffer_size_; - ObserverList<Observer> observers_; + base::ObserverList<Observer> observers_; // The timer to delay configuring displays. This is used to aggregate multiple // display configuration events when they are reported in short time spans. diff --git a/ui/display/chromeos/x11/native_display_delegate_x11.h b/ui/display/chromeos/x11/native_display_delegate_x11.h index d201e5a..fadcf56 100644 --- a/ui/display/chromeos/x11/native_display_delegate_x11.h +++ b/ui/display/chromeos/x11/native_display_delegate_x11.h @@ -163,7 +163,7 @@ class DISPLAY_EXPORT NativeDisplayDelegateX11 : public NativeDisplayDelegate { scoped_ptr<NativeDisplayEventDispatcherX11> platform_event_dispatcher_; // List of observers waiting for display configuration change events. - ObserverList<NativeDisplayObserver> observers_; + base::ObserverList<NativeDisplayObserver> observers_; // A background color used during boot time + multi displays. uint32_t background_color_argb_; |