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 /gpu | |
| 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 'gpu')
| -rw-r--r-- | gpu/command_buffer/service/shader_translator.h | 2 | ||||
| -rw-r--r-- | gpu/command_buffer/service/valuebuffer_manager.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gpu/command_buffer/service/shader_translator.h b/gpu/command_buffer/service/shader_translator.h index ac431e3..858014d 100644 --- a/gpu/command_buffer/service/shader_translator.h +++ b/gpu/command_buffer/service/shader_translator.h @@ -118,7 +118,7 @@ class GPU_EXPORT ShaderTranslator ShHandle compiler_; bool implementation_is_glsl_es_; ShCompileOptions driver_bug_workarounds_; - ObserverList<DestructionObserver> destruction_observers_; + base::ObserverList<DestructionObserver> destruction_observers_; }; } // namespace gles2 diff --git a/gpu/command_buffer/service/valuebuffer_manager.h b/gpu/command_buffer/service/valuebuffer_manager.h index d67616a..774b3a3 100644 --- a/gpu/command_buffer/service/valuebuffer_manager.h +++ b/gpu/command_buffer/service/valuebuffer_manager.h @@ -52,7 +52,7 @@ class GPU_EXPORT SubscriptionRefSet RefSet reference_set_; - ObserverList<Observer, true> observers_; + base::ObserverList<Observer, true> observers_; DISALLOW_COPY_AND_ASSIGN(SubscriptionRefSet); }; |