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

Side by Side Diff: content/renderer/media/remote_media_stream_impl.cc

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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 #include "content/renderer/media/remote_media_stream_impl.h" 5 #include "content/renderer/media/remote_media_stream_impl.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 public webrtc::ObserverInterface, 96 public webrtc::ObserverInterface,
97 public base::NonThreadSafe { 97 public base::NonThreadSafe {
98 public: 98 public:
99 RemoteAudioMediaStreamTrackAdapter( 99 RemoteAudioMediaStreamTrackAdapter(
100 webrtc::MediaStreamTrackInterface* webrtc_track, 100 webrtc::MediaStreamTrackInterface* webrtc_track,
101 const blink::WebMediaStreamTrack& webkit_track); 101 const blink::WebMediaStreamTrack& webkit_track);
102 virtual ~RemoteAudioMediaStreamTrackAdapter(); 102 virtual ~RemoteAudioMediaStreamTrackAdapter();
103 103
104 private: 104 private:
105 // webrtc::ObserverInterface implementation. 105 // webrtc::ObserverInterface implementation.
106 virtual void OnChanged() OVERRIDE; 106 virtual void OnChanged() override;
107 107
108 webrtc::MediaStreamTrackInterface::TrackState state_; 108 webrtc::MediaStreamTrackInterface::TrackState state_;
109 109
110 DISALLOW_COPY_AND_ASSIGN(RemoteAudioMediaStreamTrackAdapter); 110 DISALLOW_COPY_AND_ASSIGN(RemoteAudioMediaStreamTrackAdapter);
111 }; 111 };
112 112
113 RemoteAudioMediaStreamTrackAdapter::RemoteAudioMediaStreamTrackAdapter( 113 RemoteAudioMediaStreamTrackAdapter::RemoteAudioMediaStreamTrackAdapter(
114 webrtc::MediaStreamTrackInterface* webrtc_track, 114 webrtc::MediaStreamTrackInterface* webrtc_track,
115 const blink::WebMediaStreamTrack& webkit_track) 115 const blink::WebMediaStreamTrack& webkit_track)
116 : RemoteMediaStreamTrackAdapter(webrtc_track, webkit_track), 116 : RemoteMediaStreamTrackAdapter(webrtc_track, webkit_track),
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 InitializeWebkitTrack(*it, &new_track, 248 InitializeWebkitTrack(*it, &new_track,
249 blink::WebMediaStreamSource::TypeVideo); 249 blink::WebMediaStreamSource::TypeVideo);
250 video_track_observers_.push_back( 250 video_track_observers_.push_back(
251 new RemoteMediaStreamTrackAdapter(*it, new_track)); 251 new RemoteMediaStreamTrackAdapter(*it, new_track));
252 webkit_stream_.addTrack(new_track); 252 webkit_stream_.addTrack(new_track);
253 } 253 }
254 } 254 }
255 } 255 }
256 256
257 } // namespace content 257 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/remote_media_stream_impl.h ('k') | content/renderer/media/render_media_log.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698