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

Unified Diff: content/browser/media/capture/desktop_capture_device.h

Issue 268123003: Enables using the magnification API for screen capturing on Windows under a Finch experiment. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/browser/media/capture/desktop_capture_device.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/media/capture/desktop_capture_device.h
diff --git a/content/browser/media/capture/desktop_capture_device.h b/content/browser/media/capture/desktop_capture_device.h
index af16bda4127821922924ce8868d23e6dbf4a98be..9fb8ca419fa7d82759e107864cfae6783cba20ce 100644
--- a/content/browser/media/capture/desktop_capture_device.h
+++ b/content/browser/media/capture/desktop_capture_device.h
@@ -14,6 +14,7 @@
namespace base {
class SequencedTaskRunner;
+class Thread;
} // namespace base
namespace webrtc {
@@ -33,9 +34,6 @@ class CONTENT_EXPORT DesktopCaptureDevice : public media::VideoCaptureDevice {
static scoped_ptr<media::VideoCaptureDevice> Create(
const DesktopMediaID& source);
- DesktopCaptureDevice(scoped_refptr<base::SequencedTaskRunner> task_runner,
- scoped_ptr<webrtc::DesktopCapturer> desktop_capturer,
- DesktopMediaID::Type type);
virtual ~DesktopCaptureDevice();
// VideoCaptureDevice interface.
@@ -47,7 +45,15 @@ class CONTENT_EXPORT DesktopCaptureDevice : public media::VideoCaptureDevice {
void SetNotificationWindowId(gfx::NativeViewId window_id);
private:
+ friend class DesktopCaptureDeviceTest;
class Core;
+
+ // Either |task_runner| or |thread| should be non-NULL, but not both.
+ DesktopCaptureDevice(scoped_refptr<base::SequencedTaskRunner> task_runner,
+ scoped_ptr<base::Thread> thread,
+ scoped_ptr<webrtc::DesktopCapturer> desktop_capturer,
+ DesktopMediaID::Type type);
+
scoped_refptr<Core> core_;
DISALLOW_COPY_AND_ASSIGN(DesktopCaptureDevice);
« no previous file with comments | « no previous file | content/browser/media/capture/desktop_capture_device.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698