Index: chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc |
diff --git a/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc b/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc |
index 01a8438f21877306ba494763c65fb35a46f819a8..04c3685110401a8a43a598b0e45f69ea92f522df 100644 |
--- a/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc |
+++ b/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc |
@@ -5,6 +5,7 @@ |
#include "chrome/browser/extensions/api/desktop_capture/desktop_capture_base.h" |
#include <tuple> |
+#include <utility> |
#include "base/strings/utf_string_conversions.h" |
#include "build/build_config.h" |
@@ -125,8 +126,8 @@ bool DesktopCaptureChooseDesktopMediaFunctionBase::Execute( |
scoped_ptr<webrtc::WindowCapturer> window_capturer( |
show_windows ? webrtc::WindowCapturer::Create(options) : NULL); |
- media_list.reset(new NativeDesktopMediaList( |
- screen_capturer.Pass(), window_capturer.Pass())); |
+ media_list.reset(new NativeDesktopMediaList(std::move(screen_capturer), |
+ std::move(window_capturer))); |
} |
// DesktopMediaPicker is implemented only for Windows, OSX and |
@@ -147,13 +148,9 @@ bool DesktopCaptureChooseDesktopMediaFunctionBase::Execute( |
&DesktopCaptureChooseDesktopMediaFunctionBase::OnPickerDialogResults, |
this); |
- picker_->Show(web_contents, |
- parent_window, |
- parent_window, |
- base::UTF8ToUTF16(extension()->name()), |
- target_name, |
- media_list.Pass(), |
- callback); |
+ picker_->Show(web_contents, parent_window, parent_window, |
+ base::UTF8ToUTF16(extension()->name()), target_name, |
+ std::move(media_list), callback); |
origin_ = origin; |
return true; |
} |