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

Side by Side Diff: content/renderer/media/android/stream_texture_factory_synchronous_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_SYNCHRONOUS_IMPL_H _ 5 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_SYNCHRONOUS_IMPL_H _
6 #define CONTENT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_SYNCHRONOUS_IMPL_H _ 6 #define CONTENT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_SYNCHRONOUS_IMPL_H _
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/observer_list.h" 10 #include "base/observer_list.h"
(...skipping 29 matching lines...) Expand all
40 virtual ~ContextProvider() {} 40 virtual ~ContextProvider() {}
41 }; 41 };
42 42
43 typedef base::Callback<scoped_refptr<ContextProvider>(void)> 43 typedef base::Callback<scoped_refptr<ContextProvider>(void)>
44 CreateContextProviderCallback; 44 CreateContextProviderCallback;
45 45
46 static scoped_refptr<StreamTextureFactorySynchronousImpl> Create( 46 static scoped_refptr<StreamTextureFactorySynchronousImpl> Create(
47 const CreateContextProviderCallback& try_create_callback, 47 const CreateContextProviderCallback& try_create_callback,
48 int frame_id); 48 int frame_id);
49 49
50 virtual StreamTextureProxy* CreateProxy() OVERRIDE; 50 virtual StreamTextureProxy* CreateProxy() override;
51 virtual void EstablishPeer(int32 stream_id, int player_id) OVERRIDE; 51 virtual void EstablishPeer(int32 stream_id, int player_id) override;
52 virtual unsigned CreateStreamTexture(unsigned texture_target, 52 virtual unsigned CreateStreamTexture(unsigned texture_target,
53 unsigned* texture_id, 53 unsigned* texture_id,
54 gpu::Mailbox* texture_mailbox) OVERRIDE; 54 gpu::Mailbox* texture_mailbox) override;
55 virtual void SetStreamTextureSize(int32 stream_id, 55 virtual void SetStreamTextureSize(int32 stream_id,
56 const gfx::Size& size) OVERRIDE; 56 const gfx::Size& size) override;
57 virtual gpu::gles2::GLES2Interface* ContextGL() OVERRIDE; 57 virtual gpu::gles2::GLES2Interface* ContextGL() override;
58 virtual void AddObserver(StreamTextureFactoryContextObserver* obs) OVERRIDE; 58 virtual void AddObserver(StreamTextureFactoryContextObserver* obs) override;
59 virtual void RemoveObserver( 59 virtual void RemoveObserver(
60 StreamTextureFactoryContextObserver* obs) OVERRIDE; 60 StreamTextureFactoryContextObserver* obs) override;
61 61
62 private: 62 private:
63 friend class base::RefCounted<StreamTextureFactorySynchronousImpl>; 63 friend class base::RefCounted<StreamTextureFactorySynchronousImpl>;
64 StreamTextureFactorySynchronousImpl( 64 StreamTextureFactorySynchronousImpl(
65 const CreateContextProviderCallback& try_create_callback, 65 const CreateContextProviderCallback& try_create_callback,
66 int frame_id); 66 int frame_id);
67 virtual ~StreamTextureFactorySynchronousImpl(); 67 virtual ~StreamTextureFactorySynchronousImpl();
68 68
69 CreateContextProviderCallback create_context_provider_callback_; 69 CreateContextProviderCallback create_context_provider_callback_;
70 scoped_refptr<ContextProvider> context_provider_; 70 scoped_refptr<ContextProvider> context_provider_;
71 int frame_id_; 71 int frame_id_;
72 StreamTextureFactoryContextObserver* observer_; 72 StreamTextureFactoryContextObserver* observer_;
73 73
74 DISALLOW_IMPLICIT_CONSTRUCTORS(StreamTextureFactorySynchronousImpl); 74 DISALLOW_IMPLICIT_CONSTRUCTORS(StreamTextureFactorySynchronousImpl);
75 }; 75 };
76 76
77 } // namespace content 77 } // namespace content
78 78
79 #endif // CONTENT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_SYNCHRONOUS_IMP L_H_ 79 #endif // CONTENT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_SYNCHRONOUS_IMP L_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698