Source/platform/mediastream/MediaStreamCenter.h - Issue 630853002: Replacing the OVERRIDE with override in third_party/WebKit/Source/platform

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: Source/platform/mediastream/MediaStreamCenter.h

Issue 630853002: Replacing the OVERRIDE with override in third_party/WebKit/Source/platform (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Rebase build fix 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

« no previous file with comments | « Source/platform/mac/ScrollElasticityControllerTest.mm ('k') | Source/platform/mediastream/MediaStreamComponent.h » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright 2014 Google Inc. All rights reserved.	2 * Copyright 2014 Google Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions	5 * modification, are permitted provided that the following conditions

6 * are met:	6 * are met:

7 *	7 *

8 * 1. Redistributions of source code must retain the above copyright	8 * 1. Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * 2. Redistributions in binary form must reproduce the above copyright	10 * 2. Redistributions in binary form must reproduce the above copyright

(...skipping 55 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
66 bool didStopMediaStreamTrack(MediaStreamComponent*);	66 bool didStopMediaStreamTrack(MediaStreamComponent*);

67 PassOwnPtr<AudioSourceProvider> createWebAudioSourceFromMediaStreamTrack(Med iaStreamComponent*);	67 PassOwnPtr<AudioSourceProvider> createWebAudioSourceFromMediaStreamTrack(Med iaStreamComponent*);

68	68

69 void didCreateMediaStream(MediaStreamDescriptor*);	69 void didCreateMediaStream(MediaStreamDescriptor*);

70 void didCreateMediaStreamAndTracks(MediaStreamDescriptor*);	70 void didCreateMediaStreamAndTracks(MediaStreamDescriptor*);

71 bool didAddMediaStreamTrack(MediaStreamDescriptor, MediaStreamComponent);	71 bool didAddMediaStreamTrack(MediaStreamDescriptor, MediaStreamComponent);

72 bool didRemoveMediaStreamTrack(MediaStreamDescriptor, MediaStreamComponent );	72 bool didRemoveMediaStreamTrack(MediaStreamDescriptor, MediaStreamComponent );

73 void didStopLocalMediaStream(MediaStreamDescriptor*);	73 void didStopLocalMediaStream(MediaStreamDescriptor*);

74	74

75 // blink::WebMediaStreamCenterClient	75 // blink::WebMediaStreamCenterClient

76 virtual void stopLocalMediaStream(const blink::WebMediaStream&) OVERRIDE;	76 virtual void stopLocalMediaStream(const blink::WebMediaStream&) override;

77	77

78 private:	78 private:

79 MediaStreamCenter();	79 MediaStreamCenter();

80	80

81 OwnPtr<blink::WebMediaStreamCenter> m_private;	81 OwnPtr<blink::WebMediaStreamCenter> m_private;

82 };	82 };

83	83

84 } // namespace blink	84 } // namespace blink

85	85

86 #endif // MediaStreamCenter_h	86 #endif // MediaStreamCenter_h

OLD	NEW