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

Side by Side Diff: content/browser/media/capture/web_contents_video_capture_device.h

Issue 629963002: Replacing the OVERRIDE with override and FINAL with final in content/browser/media (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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_BROWSER_MEDIA_CAPTURE_WEB_CONTENTS_VIDEO_CAPTURE_DEVICE_H_ 5 #ifndef CONTENT_BROWSER_MEDIA_CAPTURE_WEB_CONTENTS_VIDEO_CAPTURE_DEVICE_H_
6 #define CONTENT_BROWSER_MEDIA_CAPTURE_WEB_CONTENTS_VIDEO_CAPTURE_DEVICE_H_ 6 #define CONTENT_BROWSER_MEDIA_CAPTURE_WEB_CONTENTS_VIDEO_CAPTURE_DEVICE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 18 matching lines...) Expand all
29 : public media::VideoCaptureDevice { 29 : public media::VideoCaptureDevice {
30 public: 30 public:
31 // Create a WebContentsVideoCaptureDevice instance from the given 31 // Create a WebContentsVideoCaptureDevice instance from the given
32 // |device_id|. Returns NULL if |device_id| is invalid. 32 // |device_id|. Returns NULL if |device_id| is invalid.
33 static media::VideoCaptureDevice* Create(const std::string& device_id); 33 static media::VideoCaptureDevice* Create(const std::string& device_id);
34 34
35 virtual ~WebContentsVideoCaptureDevice(); 35 virtual ~WebContentsVideoCaptureDevice();
36 36
37 // VideoCaptureDevice implementation. 37 // VideoCaptureDevice implementation.
38 virtual void AllocateAndStart(const media::VideoCaptureParams& params, 38 virtual void AllocateAndStart(const media::VideoCaptureParams& params,
39 scoped_ptr<Client> client) OVERRIDE; 39 scoped_ptr<Client> client) override;
40 virtual void StopAndDeAllocate() OVERRIDE; 40 virtual void StopAndDeAllocate() override;
41 41
42 private: 42 private:
43 WebContentsVideoCaptureDevice( 43 WebContentsVideoCaptureDevice(
44 int render_process_id, int main_render_frame_id); 44 int render_process_id, int main_render_frame_id);
45 45
46 const scoped_ptr<ContentVideoCaptureDeviceCore> core_; 46 const scoped_ptr<ContentVideoCaptureDeviceCore> core_;
47 47
48 DISALLOW_COPY_AND_ASSIGN(WebContentsVideoCaptureDevice); 48 DISALLOW_COPY_AND_ASSIGN(WebContentsVideoCaptureDevice);
49 }; 49 };
50 50
51 51
52 } // namespace content 52 } // namespace content
53 53
54 #endif // CONTENT_BROWSER_MEDIA_CAPTURE_WEB_CONTENTS_VIDEO_CAPTURE_DEVICE_H_ 54 #endif // CONTENT_BROWSER_MEDIA_CAPTURE_WEB_CONTENTS_VIDEO_CAPTURE_DEVICE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698