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

Unified Diff: content/browser/renderer_host/media/video_capture_manager.cc

Issue 93583003: Reland 237634 and 237645. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase at 237726. Created 7 years, 1 month 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
Index: content/browser/renderer_host/media/video_capture_manager.cc
diff --git a/content/browser/renderer_host/media/video_capture_manager.cc b/content/browser/renderer_host/media/video_capture_manager.cc
index 18a7f2b679b5d0bb899fbe573867c74d39460d7d..00fa52e43eb0e366848c675ecf7bd44a6559dfe9 100644
--- a/content/browser/renderer_host/media/video_capture_manager.cc
+++ b/content/browser/renderer_host/media/video_capture_manager.cc
@@ -25,6 +25,9 @@
#if defined(ENABLE_SCREEN_CAPTURE)
#include "content/browser/renderer_host/media/desktop_capture_device.h"
+#if defined(OS_CHROMEOS)
+#include "content/browser/renderer_host/media/desktop_capture_device_ash.h"
+#endif
#endif
namespace content {
@@ -162,7 +165,12 @@ void VideoCaptureManager::DoStartDeviceOnDeviceThread(
#if defined(ENABLE_SCREEN_CAPTURE)
DesktopMediaID id = DesktopMediaID::Parse(entry->id);
if (id.type != DesktopMediaID::TYPE_NONE) {
+#if defined(OS_CHROMEOS)
+ // TODO(hshi): enable this path for Ash windows in metro mode.
+ video_capture_device.reset(DesktopCaptureDeviceAsh::Create(id));
+#else
video_capture_device = DesktopCaptureDevice::Create(id);
+#endif
}
#endif // defined(ENABLE_SCREEN_CAPTURE)
break;

Powered by Google App Engine
This is Rietveld 408576698