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

Side by Side Diff: content/browser/renderer_host/media/video_capture_manager.cc

Issue 615133002: Add support for a virtual display on ChromeOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix remaining comment periods (thanks achuithb@) Created 5 years, 10 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "content/browser/renderer_host/media/video_capture_manager.h" 5 #include "content/browser/renderer_host/media/video_capture_manager.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <set> 8 #include <set>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 } 404 }
405 case MEDIA_TAB_VIDEO_CAPTURE: { 405 case MEDIA_TAB_VIDEO_CAPTURE: {
406 video_capture_device.reset( 406 video_capture_device.reset(
407 WebContentsVideoCaptureDevice::Create(id)); 407 WebContentsVideoCaptureDevice::Create(id));
408 break; 408 break;
409 } 409 }
410 case MEDIA_DESKTOP_VIDEO_CAPTURE: { 410 case MEDIA_DESKTOP_VIDEO_CAPTURE: {
411 #if defined(ENABLE_SCREEN_CAPTURE) 411 #if defined(ENABLE_SCREEN_CAPTURE)
412 DesktopMediaID desktop_id = DesktopMediaID::Parse(id); 412 DesktopMediaID desktop_id = DesktopMediaID::Parse(id);
413 #if defined(USE_AURA) 413 #if defined(USE_AURA)
414 if (desktop_id.type == DesktopMediaID::TYPE_AURA_WINDOW) { 414 if (desktop_id.type == DesktopMediaID::TYPE_AURA_WINDOW ||
415 desktop_id.type == DesktopMediaID::TYPE_AURA_VIRTUAL_SCREEN) {
415 video_capture_device.reset( 416 video_capture_device.reset(
416 DesktopCaptureDeviceAura::Create(desktop_id)); 417 DesktopCaptureDeviceAura::Create(desktop_id));
417 } else 418 } else
418 #endif 419 #endif
419 if (desktop_id.type != DesktopMediaID::TYPE_NONE && 420 if (desktop_id.type != DesktopMediaID::TYPE_NONE &&
420 desktop_id.type != DesktopMediaID::TYPE_AURA_WINDOW) { 421 desktop_id.type != DesktopMediaID::TYPE_AURA_WINDOW) {
421 video_capture_device = DesktopCaptureDevice::Create(desktop_id); 422 video_capture_device = DesktopCaptureDevice::Create(desktop_id);
422 } 423 }
423 #endif // defined(ENABLE_SCREEN_CAPTURE) 424 #endif // defined(ENABLE_SCREEN_CAPTURE)
424 break; 425 break;
(...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after
858 DCHECK(IsOnDeviceThread()); 859 DCHECK(IsOnDeviceThread());
859 #if defined(ENABLE_SCREEN_CAPTURE) 860 #if defined(ENABLE_SCREEN_CAPTURE)
860 DesktopCaptureDevice* desktop_device = 861 DesktopCaptureDevice* desktop_device =
861 static_cast<DesktopCaptureDevice*>(device); 862 static_cast<DesktopCaptureDevice*>(device);
862 desktop_device->SetNotificationWindowId(window_id); 863 desktop_device->SetNotificationWindowId(window_id);
863 VLOG(2) << "Screen capture notification window passed on device thread."; 864 VLOG(2) << "Screen capture notification window passed on device thread.";
864 #endif 865 #endif
865 } 866 }
866 867
867 } // namespace content 868 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698