| Index: content/browser/android/in_process/synchronous_compositor_factory_impl.cc
|
| diff --git a/content/browser/android/in_process/synchronous_compositor_factory_impl.cc b/content/browser/android/in_process/synchronous_compositor_factory_impl.cc
|
| index a329fde6f7409518afd948d2654c1f94305fe747..df6d6472c2837f0566cabf9be7ce364a34466eb5 100644
|
| --- a/content/browser/android/in_process/synchronous_compositor_factory_impl.cc
|
| +++ b/content/browser/android/in_process/synchronous_compositor_factory_impl.cc
|
| @@ -120,20 +120,20 @@ class SynchronousCompositorFactoryImpl::VideoContextProvider
|
| }
|
|
|
| virtual scoped_refptr<gfx::SurfaceTexture> GetSurfaceTexture(
|
| - uint32 stream_id) OVERRIDE {
|
| + uint32 stream_id) override {
|
| return gl_in_process_context_->GetSurfaceTexture(stream_id);
|
| }
|
|
|
| - virtual gpu::gles2::GLES2Interface* ContextGL() OVERRIDE {
|
| + virtual gpu::gles2::GLES2Interface* ContextGL() override {
|
| return context_provider_->ContextGL();
|
| }
|
|
|
| - virtual void AddObserver(StreamTextureFactoryContextObserver* obs) OVERRIDE {
|
| + virtual void AddObserver(StreamTextureFactoryContextObserver* obs) override {
|
| observer_list_.AddObserver(obs);
|
| }
|
|
|
| virtual void RemoveObserver(
|
| - StreamTextureFactoryContextObserver* obs) OVERRIDE {
|
| + StreamTextureFactoryContextObserver* obs) override {
|
| observer_list_.RemoveObserver(obs);
|
| }
|
|
|
|
|