diff options
| author | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-24 01:22:31 +0000 |
|---|---|---|
| committer | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-24 01:22:31 +0000 |
| commit | 184901d5e687452f8cb83276bb63a46246e4bd4d (patch) | |
| tree | 3ab038bdeef3522fe3cbbcf2f61b66f731bc6283 | |
| parent | 90e0376d6823b747f2b3c4e2bbf3e1b62e88a0a8 (diff) | |
| download | chromium_src-184901d5e687452f8cb83276bb63a46246e4bd4d.zip chromium_src-184901d5e687452f8cb83276bb63a46246e4bd4d.tar.gz chromium_src-184901d5e687452f8cb83276bb63a46246e4bd4d.tar.bz2 | |
Merge 252417 "Create DeviceMediaID for screen w/ correct 'id' value"
> Create DeviceMediaID for screen w/ correct 'id' value
>
> When per-screen capture supported was added to WebRTC, the
> MediaCaptureDevicesDispatcher was incorrectly set to request "screen:0"
> rather than "screen" to capture the entire desktop, in effect.
>
> BUG=343926
>
> Review URL: https://codereview.chromium.org/171023007
TBR=wez@chromium.org
Review URL: https://codereview.chromium.org/176753002
git-svn-id: svn://svn.chromium.org/chrome/branches/1847/src@252867 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/media/media_capture_devices_dispatcher.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/media/media_capture_devices_dispatcher.cc b/chrome/browser/media/media_capture_devices_dispatcher.cc index 690bd1b..10a6780 100644 --- a/chrome/browser/media/media_capture_devices_dispatcher.cc +++ b/chrome/browser/media/media_capture_devices_dispatcher.cc @@ -36,6 +36,7 @@ #include "extensions/common/extension.h" #include "grit/generated_resources.h" #include "media/audio/audio_manager_base.h" +#include "third_party/webrtc/modules/desktop_capture/desktop_capture_types.h" #include "ui/base/l10n/l10n_util.h" #if defined(OS_CHROMEOS) @@ -411,7 +412,8 @@ void MediaCaptureDevicesDispatcher::ProcessScreenCaptureAccessRequest( ash::Shell::GetInstance()->GetPrimaryRootWindow()); #else // defined(OS_CHROMEOS) screen_id = - content::DesktopMediaID(content::DesktopMediaID::TYPE_SCREEN, 0); + content::DesktopMediaID(content::DesktopMediaID::TYPE_SCREEN, + webrtc::kFullDesktopScreenId); #endif // !defined(OS_CHROMEOS) bool capture_audio = |