OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_cocoa.h" | 5 #include "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_cocoa.h" |
6 | 6 |
| 7 #include <utility> |
| 8 |
7 #import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.h" | 9 #import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.h" |
8 | 10 |
9 DesktopMediaPickerCocoa::DesktopMediaPickerCocoa() { | 11 DesktopMediaPickerCocoa::DesktopMediaPickerCocoa() { |
10 } | 12 } |
11 | 13 |
12 DesktopMediaPickerCocoa::~DesktopMediaPickerCocoa() { | 14 DesktopMediaPickerCocoa::~DesktopMediaPickerCocoa() { |
13 } | 15 } |
14 | 16 |
15 void DesktopMediaPickerCocoa::Show(content::WebContents* web_contents, | 17 void DesktopMediaPickerCocoa::Show(content::WebContents* web_contents, |
16 gfx::NativeWindow context, | 18 gfx::NativeWindow context, |
17 gfx::NativeWindow parent, | 19 gfx::NativeWindow parent, |
18 const base::string16& app_name, | 20 const base::string16& app_name, |
19 const base::string16& target_name, | 21 const base::string16& target_name, |
20 scoped_ptr<DesktopMediaList> media_list, | 22 scoped_ptr<DesktopMediaList> media_list, |
21 const DoneCallback& done_callback) { | 23 const DoneCallback& done_callback) { |
22 controller_.reset( | 24 controller_.reset([[DesktopMediaPickerController alloc] |
23 [[DesktopMediaPickerController alloc] initWithMediaList:media_list.Pass() | 25 initWithMediaList:std::move(media_list) |
24 parent:parent | 26 parent:parent |
25 callback:done_callback | 27 callback:done_callback |
26 appName:app_name | 28 appName:app_name |
27 targetName:target_name]); | 29 targetName:target_name]); |
28 [controller_ showWindow:nil]; | 30 [controller_ showWindow:nil]; |
29 } | 31 } |
30 | 32 |
31 // static | 33 // static |
32 scoped_ptr<DesktopMediaPicker> DesktopMediaPicker::Create() { | 34 scoped_ptr<DesktopMediaPicker> DesktopMediaPicker::Create() { |
33 return scoped_ptr<DesktopMediaPicker>(new DesktopMediaPickerCocoa()); | 35 return scoped_ptr<DesktopMediaPicker>(new DesktopMediaPickerCocoa()); |
34 } | 36 } |
OLD | NEW |