| Index: chrome/browser/ui/cocoa/media_picker/desktop_media_picker_cocoa.mm
|
| diff --git a/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_cocoa.mm b/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_cocoa.mm
|
| index 8708f3ab246951269980c5e38414b55b60b05ce5..d8d4a3eef202bac3055fb1d41f8ce77a1c9cd6d0 100644
|
| --- a/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_cocoa.mm
|
| +++ b/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_cocoa.mm
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_cocoa.h"
|
|
|
| +#include <utility>
|
| +
|
| #import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.h"
|
|
|
| DesktopMediaPickerCocoa::DesktopMediaPickerCocoa() {
|
| @@ -19,12 +21,12 @@ void DesktopMediaPickerCocoa::Show(content::WebContents* web_contents,
|
| const base::string16& target_name,
|
| scoped_ptr<DesktopMediaList> media_list,
|
| const DoneCallback& done_callback) {
|
| - controller_.reset(
|
| - [[DesktopMediaPickerController alloc] initWithMediaList:media_list.Pass()
|
| - parent:parent
|
| - callback:done_callback
|
| - appName:app_name
|
| - targetName:target_name]);
|
| + controller_.reset([[DesktopMediaPickerController alloc]
|
| + initWithMediaList:std::move(media_list)
|
| + parent:parent
|
| + callback:done_callback
|
| + appName:app_name
|
| + targetName:target_name]);
|
| [controller_ showWindow:nil];
|
| }
|
|
|
|
|