Index: chrome/browser/ui/views/desktop_media_picker_views.cc |
diff --git a/chrome/browser/ui/views/desktop_media_picker_views.cc b/chrome/browser/ui/views/desktop_media_picker_views.cc |
index 21e618c432ced9ff1fc256565471fa9596ce784d..1c89f35c3111bef1979e766d7532d03ac60b5733 100644 |
--- a/chrome/browser/ui/views/desktop_media_picker_views.cc |
+++ b/chrome/browser/ui/views/desktop_media_picker_views.cc |
@@ -5,6 +5,7 @@ |
#include "chrome/browser/ui/views/desktop_media_picker_views.h" |
#include <stddef.h> |
+#include <utility> |
#include "base/callback.h" |
#include "base/command_line.h" |
@@ -210,9 +211,7 @@ void DesktopMediaSourceView::OnGestureEvent(ui::GestureEvent* event) { |
DesktopMediaListView::DesktopMediaListView( |
DesktopMediaPickerDialogView* parent, |
scoped_ptr<DesktopMediaList> media_list) |
- : parent_(parent), |
- media_list_(media_list.Pass()), |
- weak_factory_(this) { |
+ : parent_(parent), media_list_(std::move(media_list)), weak_factory_(this) { |
media_list_->SetThumbnailSize(gfx::Size(kThumbnailWidth, kThumbnailHeight)); |
SetFocusable(true); |
} |
@@ -398,7 +397,7 @@ DesktopMediaPickerDialogView::DesktopMediaPickerDialogView( |
app_name_(app_name), |
label_(new views::Label()), |
scroll_view_(views::ScrollView::CreateScrollViewWithBorder()), |
- list_view_(new DesktopMediaListView(this, media_list.Pass())) { |
+ list_view_(new DesktopMediaListView(this, std::move(media_list))) { |
if (app_name == target_name) { |
label_->SetText( |
l10n_util::GetStringFUTF16(IDS_DESKTOP_MEDIA_PICKER_TEXT, app_name)); |
@@ -587,8 +586,9 @@ void DesktopMediaPickerViews::Show(content::WebContents* web_contents, |
scoped_ptr<DesktopMediaList> media_list, |
const DoneCallback& done_callback) { |
callback_ = done_callback; |
- dialog_ = new DesktopMediaPickerDialogView( |
- web_contents, context, this, app_name, target_name, media_list.Pass()); |
+ dialog_ = |
+ new DesktopMediaPickerDialogView(web_contents, context, this, app_name, |
+ target_name, std::move(media_list)); |
} |
void DesktopMediaPickerViews::NotifyDialogResult(DesktopMediaID source) { |