content/renderer/media/android/stream_texture_factory_impl.h - Issue 633303002: Replace FINAL and OVERRIDE with their C++11 counterparts in content/renderer

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/renderer/media/android/renderer_media_player_manager.h ('k') | content/renderer/media/android/stream_texture_factory_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/android/stream_texture_factory_impl.h

diff --git a/content/renderer/media/android/stream_texture_factory_impl.h b/content/renderer/media/android/stream_texture_factory_impl.h

index 62586b0a0657f7ed7a0e8ac0c64b1e1e87f6ceb4..f5ded1c8b059b73a02cf5a1e4105721f04062999 100644

--- a/content/renderer/media/android/stream_texture_factory_impl.h

+++ b/content/renderer/media/android/stream_texture_factory_impl.h

@@ -29,17 +29,17 @@ class StreamTextureFactoryImpl : public StreamTextureFactory {

int frame_id);

// StreamTextureFactory implementation.

- virtual StreamTextureProxy* CreateProxy() OVERRIDE;

- virtual void EstablishPeer(int32 stream_id, int player_id) OVERRIDE;

+ virtual StreamTextureProxy* CreateProxy() override;

+ virtual void EstablishPeer(int32 stream_id, int player_id) override;

virtual unsigned CreateStreamTexture(unsigned texture_target,

unsigned* texture_id,

- gpu::Mailbox* texture_mailbox) OVERRIDE;

+ gpu::Mailbox* texture_mailbox) override;

virtual void SetStreamTextureSize(int32 texture_id,

- const gfx::Size& size) OVERRIDE;

- virtual gpu::gles2::GLES2Interface* ContextGL() OVERRIDE;

- virtual void AddObserver(StreamTextureFactoryContextObserver* obs) OVERRIDE;

+ const gfx::Size& size) override;

+ virtual gpu::gles2::GLES2Interface* ContextGL() override;

+ virtual void AddObserver(StreamTextureFactoryContextObserver* obs) override;

virtual void RemoveObserver(

- StreamTextureFactoryContextObserver* obs) OVERRIDE;

+ StreamTextureFactoryContextObserver* obs) override;

private:

friend class base::RefCounted<StreamTextureFactoryImpl>;