| Index: chrome/browser/media/native_desktop_media_list.cc
|
| diff --git a/chrome/browser/media/native_desktop_media_list.cc b/chrome/browser/media/native_desktop_media_list.cc
|
| index 7849bbe822e8d8c02bae448723a010084346d9ba..eaa8e0f2ffd47389544ea7b8931c4a5b3115db65 100644
|
| --- a/chrome/browser/media/native_desktop_media_list.cc
|
| +++ b/chrome/browser/media/native_desktop_media_list.cc
|
| @@ -96,7 +96,8 @@ class NativeDesktopMediaList::Worker
|
| typedef std::map<DesktopMediaID, uint32_t> ImageHashesMap;
|
|
|
| // webrtc::DesktopCapturer::Callback interface.
|
| - void OnCaptureCompleted(webrtc::DesktopFrame* frame) override;
|
| + void OnCaptureResult(webrtc::DesktopCapturer::Result result,
|
| + std::unique_ptr<webrtc::DesktopFrame> frame) override;
|
|
|
| base::WeakPtr<NativeDesktopMediaList> media_list_;
|
|
|
| @@ -225,9 +226,10 @@ void NativeDesktopMediaList::Worker::RefreshThumbnails(
|
| media_list_));
|
| }
|
|
|
| -void NativeDesktopMediaList::Worker::OnCaptureCompleted(
|
| - webrtc::DesktopFrame* frame) {
|
| - current_frame_.reset(frame);
|
| +void NativeDesktopMediaList::Worker::OnCaptureResult(
|
| + webrtc::DesktopCapturer::Result result,
|
| + std::unique_ptr<webrtc::DesktopFrame> frame) {
|
| + current_frame_ = std::move(frame);
|
| }
|
|
|
| NativeDesktopMediaList::NativeDesktopMediaList(
|
|
|