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

Side by Side Diff: content/browser/media/capture/desktop_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) 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_BROWSER_MEDIA_CAPTURE_DESKTOP_CAPTURE_DEVICE_H_ 5 #ifndef CONTENT_BROWSER_MEDIA_CAPTURE_DESKTOP_CAPTURE_DEVICE_H_
6 #define CONTENT_BROWSER_MEDIA_CAPTURE_DESKTOP_CAPTURE_DEVICE_H_ 6 #define CONTENT_BROWSER_MEDIA_CAPTURE_DESKTOP_CAPTURE_DEVICE_H_
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/threading/thread.h" 10 #include "base/threading/thread.h"
(...skipping 21 matching lines...) Expand all
32 // Creates capturer for the specified |source| and then creates 32 // Creates capturer for the specified |source| and then creates
33 // DesktopCaptureDevice for it. May return NULL in case of a failure (e.g. if 33 // DesktopCaptureDevice for it. May return NULL in case of a failure (e.g. if
34 // requested window was destroyed). 34 // requested window was destroyed).
35 static scoped_ptr<media::VideoCaptureDevice> Create( 35 static scoped_ptr<media::VideoCaptureDevice> Create(
36 const DesktopMediaID& source); 36 const DesktopMediaID& source);
37 37
38 virtual ~DesktopCaptureDevice(); 38 virtual ~DesktopCaptureDevice();
39 39
40 // VideoCaptureDevice interface. 40 // VideoCaptureDevice interface.
41 virtual void AllocateAndStart(const media::VideoCaptureParams& params, 41 virtual void AllocateAndStart(const media::VideoCaptureParams& params,
42 scoped_ptr<Client> client) OVERRIDE; 42 scoped_ptr<Client> client) override;
43 virtual void StopAndDeAllocate() OVERRIDE; 43 virtual void StopAndDeAllocate() override;
44 44
45 // Set the platform-dependent window id for the notification window. 45 // Set the platform-dependent window id for the notification window.
46 void SetNotificationWindowId(gfx::NativeViewId window_id); 46 void SetNotificationWindowId(gfx::NativeViewId window_id);
47 47
48 private: 48 private:
49 friend class DesktopCaptureDeviceTest; 49 friend class DesktopCaptureDeviceTest;
50 class Core; 50 class Core;
51 51
52 DesktopCaptureDevice(scoped_ptr<webrtc::DesktopCapturer> desktop_capturer, 52 DesktopCaptureDevice(scoped_ptr<webrtc::DesktopCapturer> desktop_capturer,
53 DesktopMediaID::Type type); 53 DesktopMediaID::Type type);
54 54
55 base::Thread thread_; 55 base::Thread thread_;
56 scoped_ptr<Core> core_; 56 scoped_ptr<Core> core_;
57 57
58 DISALLOW_COPY_AND_ASSIGN(DesktopCaptureDevice); 58 DISALLOW_COPY_AND_ASSIGN(DesktopCaptureDevice);
59 }; 59 };
60 60
61 } // namespace content 61 } // namespace content
62 62
63 #endif // CONTENT_BROWSER_MEDIA_CAPTURE_DESKTOP_CAPTURE_DEVICE_H_ 63 #endif // CONTENT_BROWSER_MEDIA_CAPTURE_DESKTOP_CAPTURE_DEVICE_H_
OLDNEW
« no previous file with comments | « content/browser/media/audio_stream_monitor_unittest.cc ('k') | content/browser/media/capture/desktop_capture_device.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698