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> | 7 #include <utility> |
8 | 8 |
9 #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" |
10 | 10 |
11 DesktopMediaPickerCocoa::DesktopMediaPickerCocoa() { | 11 DesktopMediaPickerCocoa::DesktopMediaPickerCocoa() { |
12 } | 12 } |
13 | 13 |
14 DesktopMediaPickerCocoa::~DesktopMediaPickerCocoa() { | 14 DesktopMediaPickerCocoa::~DesktopMediaPickerCocoa() { |
15 } | 15 } |
16 | 16 |
17 void DesktopMediaPickerCocoa::Show(content::WebContents* web_contents, | 17 void DesktopMediaPickerCocoa::Show(content::WebContents* web_contents, |
18 gfx::NativeWindow context, | 18 gfx::NativeWindow context, |
19 gfx::NativeWindow parent, | 19 gfx::NativeWindow parent, |
20 const base::string16& app_name, | 20 const base::string16& app_name, |
21 const base::string16& target_name, | 21 const base::string16& target_name, |
22 scoped_ptr<DesktopMediaList> media_list, | 22 std::unique_ptr<DesktopMediaList> media_list, |
23 bool request_audio, | 23 bool request_audio, |
24 const DoneCallback& done_callback) { | 24 const DoneCallback& done_callback) { |
25 controller_.reset([[DesktopMediaPickerController alloc] | 25 controller_.reset([[DesktopMediaPickerController alloc] |
26 initWithMediaList:std::move(media_list) | 26 initWithMediaList:std::move(media_list) |
27 parent:parent | 27 parent:parent |
28 callback:done_callback | 28 callback:done_callback |
29 appName:app_name | 29 appName:app_name |
30 targetName:target_name | 30 targetName:target_name |
31 requestAudio:request_audio]); | 31 requestAudio:request_audio]); |
32 [controller_ showWindow:nil]; | 32 [controller_ showWindow:nil]; |
33 } | 33 } |
34 | 34 |
35 // static | 35 // static |
36 scoped_ptr<DesktopMediaPicker> DesktopMediaPicker::Create() { | 36 std::unique_ptr<DesktopMediaPicker> DesktopMediaPicker::Create() { |
37 return scoped_ptr<DesktopMediaPicker>(new DesktopMediaPickerCocoa()); | 37 return std::unique_ptr<DesktopMediaPicker>(new DesktopMediaPickerCocoa()); |
38 } | 38 } |
OLD | NEW |