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

Side by Side Diff: content/browser/media/capture/desktop_capture_device_aura.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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_BROWSER_MEDIA_CAPTURE_DESKTOP_CAPTURE_DEVICE_AURA_H_ 5 #ifndef CONTENT_BROWSER_MEDIA_CAPTURE_DESKTOP_CAPTURE_DEVICE_AURA_H_
6 #define CONTENT_BROWSER_MEDIA_CAPTURE_DESKTOP_CAPTURE_DEVICE_AURA_H_ 6 #define CONTENT_BROWSER_MEDIA_CAPTURE_DESKTOP_CAPTURE_DEVICE_AURA_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 13 matching lines...) Expand all
24 class CONTENT_EXPORT DesktopCaptureDeviceAura 24 class CONTENT_EXPORT DesktopCaptureDeviceAura
25 : public media::VideoCaptureDevice { 25 : public media::VideoCaptureDevice {
26 public: 26 public:
27 // Creates a VideoCaptureDevice for the Aura desktop. 27 // Creates a VideoCaptureDevice for the Aura desktop.
28 static media::VideoCaptureDevice* Create(const DesktopMediaID& source); 28 static media::VideoCaptureDevice* Create(const DesktopMediaID& source);
29 29
30 virtual ~DesktopCaptureDeviceAura(); 30 virtual ~DesktopCaptureDeviceAura();
31 31
32 // VideoCaptureDevice implementation. 32 // VideoCaptureDevice implementation.
33 virtual void AllocateAndStart(const media::VideoCaptureParams& params, 33 virtual void AllocateAndStart(const media::VideoCaptureParams& params,
34 scoped_ptr<Client> client) OVERRIDE; 34 scoped_ptr<Client> client) override;
35 virtual void StopAndDeAllocate() OVERRIDE; 35 virtual void StopAndDeAllocate() override;
36 36
37 private: 37 private:
38 DesktopCaptureDeviceAura(const DesktopMediaID& source); 38 DesktopCaptureDeviceAura(const DesktopMediaID& source);
39 39
40 const scoped_ptr<class ContentVideoCaptureDeviceCore> core_; 40 const scoped_ptr<class ContentVideoCaptureDeviceCore> core_;
41 41
42 DISALLOW_COPY_AND_ASSIGN(DesktopCaptureDeviceAura); 42 DISALLOW_COPY_AND_ASSIGN(DesktopCaptureDeviceAura);
43 }; 43 };
44 44
45 45
46 } // namespace content 46 } // namespace content
47 47
48 #endif // CONTENT_BROWSER_MEDIA_CAPTURE_DESKTOP_CAPTURE_DEVICE_AURA_H_ 48 #endif // CONTENT_BROWSER_MEDIA_CAPTURE_DESKTOP_CAPTURE_DEVICE_AURA_H_
OLDNEW
« no previous file with comments | « content/browser/media/capture/desktop_capture_device.cc ('k') | content/browser/media/capture/desktop_capture_device_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698