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

Side by Side Diff: trunk/src/content/browser/renderer_host/media/desktop_capture_device.h

Issue 84393002: Revert 236927 "Reorganize media::VideoCapture* types" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | trunk/src/content/browser/renderer_host/media/desktop_capture_device.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_RENDERER_HOST_MEDIA_DESKTOP_CAPTURE_DEVICE_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_MEDIA_DESKTOP_CAPTURE_DEVICE_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_MEDIA_DESKTOP_CAPTURE_DEVICE_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_MEDIA_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 "content/common/content_export.h" 10 #include "content/common/content_export.h"
(...skipping 20 matching lines...) Expand all
31 // DesktopCaptureDevice for it. May return NULL in case of a failure (e.g. if 31 // DesktopCaptureDevice for it. May return NULL in case of a failure (e.g. if
32 // requested window was destroyed). 32 // requested window was destroyed).
33 static scoped_ptr<media::VideoCaptureDevice> Create( 33 static scoped_ptr<media::VideoCaptureDevice> Create(
34 const DesktopMediaID& source); 34 const DesktopMediaID& source);
35 35
36 DesktopCaptureDevice(scoped_refptr<base::SequencedTaskRunner> task_runner, 36 DesktopCaptureDevice(scoped_refptr<base::SequencedTaskRunner> task_runner,
37 scoped_ptr<webrtc::DesktopCapturer> desktop_capturer); 37 scoped_ptr<webrtc::DesktopCapturer> desktop_capturer);
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(
42 scoped_ptr<Client> client) OVERRIDE; 42 const media::VideoCaptureCapability& capture_format,
43 scoped_ptr<Client> client) OVERRIDE;
43 virtual void StopAndDeAllocate() OVERRIDE; 44 virtual void StopAndDeAllocate() OVERRIDE;
44 45
45 private: 46 private:
46 class Core; 47 class Core;
47 scoped_refptr<Core> core_; 48 scoped_refptr<Core> core_;
48 49
49 DISALLOW_COPY_AND_ASSIGN(DesktopCaptureDevice); 50 DISALLOW_COPY_AND_ASSIGN(DesktopCaptureDevice);
50 }; 51 };
51 52
52 } // namespace content 53 } // namespace content
53 54
54 #endif // CONTENT_BROWSER_RENDERER_HOST_MEDIA_DESKTOP_CAPTURE_DEVICE_H_ 55 #endif // CONTENT_BROWSER_RENDERER_HOST_MEDIA_DESKTOP_CAPTURE_DEVICE_H_
OLDNEW
« no previous file with comments | « no previous file | trunk/src/content/browser/renderer_host/media/desktop_capture_device.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698