From 236d317f450601fbb56756b0b5ca802659a045f6 Mon Sep 17 00:00:00 2001 From: brettw Date: Wed, 3 Jun 2015 09:31:43 -0700 Subject: Replace more ObserverList with base::ObserverList. This is everything but the chrome directory CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel TBR=zelidrag@chromium.org (chromeos) TBR=keybuk@chromium.org (device/bluetooth) Review URL: https://codereview.chromium.org/1162943002 Cr-Commit-Position: refs/heads/master@{#332626} --- ui/ozone/platform/drm/host/drm_gpu_platform_support_host.h | 2 +- ui/ozone/platform/drm/host/drm_native_display_delegate.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'ui/ozone/platform/drm') diff --git a/ui/ozone/platform/drm/host/drm_gpu_platform_support_host.h b/ui/ozone/platform/drm/host/drm_gpu_platform_support_host.h index 25f37da..1bf4080 100644 --- a/ui/ozone/platform/drm/host/drm_gpu_platform_support_host.h +++ b/ui/ozone/platform/drm/host/drm_gpu_platform_support_host.h @@ -58,7 +58,7 @@ class DrmGpuPlatformSupportHost : public GpuPlatformSupportHost, std::vector handlers_; // Not owned. DrmCursor* cursor_; // Not owned. - ObserverList channel_observers_; + base::ObserverList channel_observers_; }; } // namespace ui diff --git a/ui/ozone/platform/drm/host/drm_native_display_delegate.h b/ui/ozone/platform/drm/host/drm_native_display_delegate.h index 262db86..6b8e690 100644 --- a/ui/ozone/platform/drm/host/drm_native_display_delegate.h +++ b/ui/ozone/platform/drm/host/drm_native_display_delegate.h @@ -57,7 +57,7 @@ class DrmNativeDisplayDelegate : public NativeDisplayDelegate { private: DrmDisplayHostManager* display_manager_; // Not owned. - ObserverList observers_; + base::ObserverList observers_; DISALLOW_COPY_AND_ASSIGN(DrmNativeDisplayDelegate); }; -- cgit v1.1