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

Side by Side Diff: content/renderer/media/webrtc/video_destination_handler.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 (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 #ifndef CONTENT_RENDERER_MEDIA_WEBRTC_VIDEO_DESTINATION_HANDLER_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_WEBRTC_VIDEO_DESTINATION_HANDLER_H_
6 #define CONTENT_RENDERER_MEDIA_WEBRTC_VIDEO_DESTINATION_HANDLER_H_ 6 #define CONTENT_RENDERER_MEDIA_WEBRTC_VIDEO_DESTINATION_HANDLER_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 28 matching lines...) Expand all
39 : NON_EXPORTED_BASE(public MediaStreamVideoSource), 39 : NON_EXPORTED_BASE(public MediaStreamVideoSource),
40 public FrameWriterInterface, 40 public FrameWriterInterface,
41 NON_EXPORTED_BASE(public base::SupportsWeakPtr<PpFrameWriter>) { 41 NON_EXPORTED_BASE(public base::SupportsWeakPtr<PpFrameWriter>) {
42 public: 42 public:
43 PpFrameWriter(); 43 PpFrameWriter();
44 virtual ~PpFrameWriter(); 44 virtual ~PpFrameWriter();
45 45
46 // FrameWriterInterface implementation. 46 // FrameWriterInterface implementation.
47 // This method will be called by the Pepper host from render thread. 47 // This method will be called by the Pepper host from render thread.
48 virtual void PutFrame(PPB_ImageData_Impl* image_data, 48 virtual void PutFrame(PPB_ImageData_Impl* image_data,
49 int64 time_stamp_ns) OVERRIDE; 49 int64 time_stamp_ns) override;
50 protected: 50 protected:
51 // MediaStreamVideoSource implementation. 51 // MediaStreamVideoSource implementation.
52 virtual void GetCurrentSupportedFormats( 52 virtual void GetCurrentSupportedFormats(
53 int max_requested_width, 53 int max_requested_width,
54 int max_requested_height, 54 int max_requested_height,
55 double max_requested_frame_rate, 55 double max_requested_frame_rate,
56 const VideoCaptureDeviceFormatsCB& callback) OVERRIDE; 56 const VideoCaptureDeviceFormatsCB& callback) override;
57 virtual void StartSourceImpl( 57 virtual void StartSourceImpl(
58 const media::VideoCaptureFormat& format, 58 const media::VideoCaptureFormat& format,
59 const VideoCaptureDeliverFrameCB& frame_callback) OVERRIDE; 59 const VideoCaptureDeliverFrameCB& frame_callback) override;
60 virtual void StopSourceImpl() OVERRIDE; 60 virtual void StopSourceImpl() override;
61 61
62 private: 62 private:
63 media::VideoFramePool frame_pool_; 63 media::VideoFramePool frame_pool_;
64 64
65 class FrameWriterDelegate; 65 class FrameWriterDelegate;
66 scoped_refptr<FrameWriterDelegate> delegate_; 66 scoped_refptr<FrameWriterDelegate> delegate_;
67 67
68 DISALLOW_COPY_AND_ASSIGN(PpFrameWriter); 68 DISALLOW_COPY_AND_ASSIGN(PpFrameWriter);
69 }; 69 };
70 70
(...skipping 12 matching lines...) Expand all
83 const std::string& url, 83 const std::string& url,
84 FrameWriterInterface** frame_writer); 84 FrameWriterInterface** frame_writer);
85 85
86 private: 86 private:
87 DISALLOW_COPY_AND_ASSIGN(VideoDestinationHandler); 87 DISALLOW_COPY_AND_ASSIGN(VideoDestinationHandler);
88 }; 88 };
89 89
90 } // namespace content 90 } // namespace content
91 91
92 #endif // CONTENT_RENDERER_MEDIA_VIDEO_DESTINATION_HANDLER_H_ 92 #endif // CONTENT_RENDERER_MEDIA_VIDEO_DESTINATION_HANDLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698