Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(271)

Side by Side Diff: content/renderer/media/android/stream_texture_factory_impl.h

Issue 633303002: Replace FINAL and OVERRIDE with their C++11 counterparts in content/renderer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_IMPL_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_IMPL_H_
6 #define CONTENT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_IMPL_H_ 6 #define CONTENT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_IMPL_H_
7 7
8 #include "content/renderer/media/android/stream_texture_factory.h" 8 #include "content/renderer/media/android/stream_texture_factory.h"
9 9
10 namespace cc { 10 namespace cc {
(...skipping 11 matching lines...) Expand all
22 class GpuChannelHost; 22 class GpuChannelHost;
23 23
24 class StreamTextureFactoryImpl : public StreamTextureFactory { 24 class StreamTextureFactoryImpl : public StreamTextureFactory {
25 public: 25 public:
26 static scoped_refptr<StreamTextureFactoryImpl> Create( 26 static scoped_refptr<StreamTextureFactoryImpl> Create(
27 const scoped_refptr<cc::ContextProvider>& context_provider, 27 const scoped_refptr<cc::ContextProvider>& context_provider,
28 GpuChannelHost* channel, 28 GpuChannelHost* channel,
29 int frame_id); 29 int frame_id);
30 30
31 // StreamTextureFactory implementation. 31 // StreamTextureFactory implementation.
32 virtual StreamTextureProxy* CreateProxy() OVERRIDE; 32 virtual StreamTextureProxy* CreateProxy() override;
33 virtual void EstablishPeer(int32 stream_id, int player_id) OVERRIDE; 33 virtual void EstablishPeer(int32 stream_id, int player_id) override;
34 virtual unsigned CreateStreamTexture(unsigned texture_target, 34 virtual unsigned CreateStreamTexture(unsigned texture_target,
35 unsigned* texture_id, 35 unsigned* texture_id,
36 gpu::Mailbox* texture_mailbox) OVERRIDE; 36 gpu::Mailbox* texture_mailbox) override;
37 virtual void SetStreamTextureSize(int32 texture_id, 37 virtual void SetStreamTextureSize(int32 texture_id,
38 const gfx::Size& size) OVERRIDE; 38 const gfx::Size& size) override;
39 virtual gpu::gles2::GLES2Interface* ContextGL() OVERRIDE; 39 virtual gpu::gles2::GLES2Interface* ContextGL() override;
40 virtual void AddObserver(StreamTextureFactoryContextObserver* obs) OVERRIDE; 40 virtual void AddObserver(StreamTextureFactoryContextObserver* obs) override;
41 virtual void RemoveObserver( 41 virtual void RemoveObserver(
42 StreamTextureFactoryContextObserver* obs) OVERRIDE; 42 StreamTextureFactoryContextObserver* obs) override;
43 43
44 private: 44 private:
45 friend class base::RefCounted<StreamTextureFactoryImpl>; 45 friend class base::RefCounted<StreamTextureFactoryImpl>;
46 StreamTextureFactoryImpl( 46 StreamTextureFactoryImpl(
47 const scoped_refptr<cc::ContextProvider>& context_provider, 47 const scoped_refptr<cc::ContextProvider>& context_provider,
48 GpuChannelHost* channel, 48 GpuChannelHost* channel,
49 int frame_id); 49 int frame_id);
50 virtual ~StreamTextureFactoryImpl(); 50 virtual ~StreamTextureFactoryImpl();
51 51
52 scoped_refptr<cc::ContextProvider> context_provider_; 52 scoped_refptr<cc::ContextProvider> context_provider_;
53 scoped_refptr<GpuChannelHost> channel_; 53 scoped_refptr<GpuChannelHost> channel_;
54 int frame_id_; 54 int frame_id_;
55 55
56 DISALLOW_IMPLICIT_CONSTRUCTORS(StreamTextureFactoryImpl); 56 DISALLOW_IMPLICIT_CONSTRUCTORS(StreamTextureFactoryImpl);
57 }; 57 };
58 58
59 } // namespace content 59 } // namespace content
60 60
61 #endif // CONTENT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_IMPL_H_ 61 #endif // CONTENT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698