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

Side by Side Diff: content/renderer/media/webrtc/video_destination_handler.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/webrtc/video_destination_handler.h" 5 #include "content/renderer/media/webrtc/video_destination_handler.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 class PpFrameWriterProxy : public FrameWriterInterface { 170 class PpFrameWriterProxy : public FrameWriterInterface {
171 public: 171 public:
172 explicit PpFrameWriterProxy(const base::WeakPtr<PpFrameWriter>& writer) 172 explicit PpFrameWriterProxy(const base::WeakPtr<PpFrameWriter>& writer)
173 : writer_(writer) { 173 : writer_(writer) {
174 DCHECK(writer_ != NULL); 174 DCHECK(writer_ != NULL);
175 } 175 }
176 176
177 virtual ~PpFrameWriterProxy() {} 177 virtual ~PpFrameWriterProxy() {}
178 178
179 virtual void PutFrame(PPB_ImageData_Impl* image_data, 179 virtual void PutFrame(PPB_ImageData_Impl* image_data,
180 int64 time_stamp_ns) OVERRIDE { 180 int64 time_stamp_ns) override {
181 writer_->PutFrame(image_data, time_stamp_ns); 181 writer_->PutFrame(image_data, time_stamp_ns);
182 } 182 }
183 183
184 private: 184 private:
185 base::WeakPtr<PpFrameWriter> writer_; 185 base::WeakPtr<PpFrameWriter> writer_;
186 186
187 DISALLOW_COPY_AND_ASSIGN(PpFrameWriterProxy); 187 DISALLOW_COPY_AND_ASSIGN(PpFrameWriterProxy);
188 }; 188 };
189 189
190 bool VideoDestinationHandler::Open( 190 bool VideoDestinationHandler::Open(
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 229
230 stream.addTrack(MediaStreamVideoTrack::CreateVideoTrack( 230 stream.addTrack(MediaStreamVideoTrack::CreateVideoTrack(
231 writer, constraints, MediaStreamVideoSource::ConstraintsCallback(), 231 writer, constraints, MediaStreamVideoSource::ConstraintsCallback(),
232 track_enabled)); 232 track_enabled));
233 233
234 *frame_writer = new PpFrameWriterProxy(writer->AsWeakPtr()); 234 *frame_writer = new PpFrameWriterProxy(writer->AsWeakPtr());
235 return true; 235 return true;
236 } 236 }
237 237
238 } // namespace content 238 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698