diff options
| author | brettw <brettw@chromium.org> | 2015-06-03 09:31:43 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-03 16:32:08 +0000 |
| commit | 236d317f450601fbb56756b0b5ca802659a045f6 (patch) | |
| tree | 086f7f2ed78889e4dc2c17f209871ba364bc9c01 /ui/compositor | |
| parent | e7938cf52a9aeb936c1cb005faaafb9f2b16cd4f (diff) | |
| download | chromium_src-236d317f450601fbb56756b0b5ca802659a045f6.zip chromium_src-236d317f450601fbb56756b0b5ca802659a045f6.tar.gz chromium_src-236d317f450601fbb56756b0b5ca802659a045f6.tar.bz2 | |
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}
Diffstat (limited to 'ui/compositor')
| -rw-r--r-- | ui/compositor/compositor.h | 4 | ||||
| -rw-r--r-- | ui/compositor/compositor_vsync_manager.h | 2 | ||||
| -rw-r--r-- | ui/compositor/layer_animation_sequence.h | 2 | ||||
| -rw-r--r-- | ui/compositor/layer_animator.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h index 3101bc2..e82c49d 100644 --- a/ui/compositor/compositor.h +++ b/ui/compositor/compositor.h @@ -334,8 +334,8 @@ class COMPOSITOR_EXPORT Compositor // The root of the Layer tree drawn by this compositor. Layer* root_layer_; - ObserverList<CompositorObserver, true> observer_list_; - ObserverList<CompositorAnimationObserver> animation_observer_list_; + base::ObserverList<CompositorObserver, true> observer_list_; + base::ObserverList<CompositorAnimationObserver> animation_observer_list_; std::list<CompositorBeginFrameObserver*> begin_frame_observer_list_; gfx::AcceleratedWidget widget_; diff --git a/ui/compositor/compositor_vsync_manager.h b/ui/compositor/compositor_vsync_manager.h index 7e9e07b..9f3e688 100644 --- a/ui/compositor/compositor_vsync_manager.h +++ b/ui/compositor/compositor_vsync_manager.h @@ -51,7 +51,7 @@ class COMPOSITOR_EXPORT CompositorVSyncManager void NotifyObservers(base::TimeTicks timebase, base::TimeDelta interval); - ObserverList<Observer> observer_list_; + base::ObserverList<Observer> observer_list_; base::TimeTicks last_timebase_; base::TimeDelta last_interval_; diff --git a/ui/compositor/layer_animation_sequence.h b/ui/compositor/layer_animation_sequence.h index 19635ad..0dad650 100644 --- a/ui/compositor/layer_animation_sequence.h +++ b/ui/compositor/layer_animation_sequence.h @@ -176,7 +176,7 @@ class COMPOSITOR_EXPORT LayerAnimationSequence int animation_group_id_; // These parties are notified when layer animations end. - ObserverList<LayerAnimationObserver> observers_; + base::ObserverList<LayerAnimationObserver> observers_; // Tracks the last_progressed_fraction() of the most recently progressed // element. diff --git a/ui/compositor/layer_animator.h b/ui/compositor/layer_animator.h index 69744f8..99b3765 100644 --- a/ui/compositor/layer_animator.h +++ b/ui/compositor/layer_animator.h @@ -349,7 +349,7 @@ class COMPOSITOR_EXPORT LayerAnimator : public base::RefCounted<LayerAnimator> { // Observers are notified when layer animations end, are scheduled or are // aborted. - ObserverList<LayerAnimationObserver> observers_; + base::ObserverList<LayerAnimationObserver> observers_; DISALLOW_COPY_AND_ASSIGN(LayerAnimator); }; |