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 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_de
precated.h" | 10 #import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_de
precated.h" |
(...skipping 10 matching lines...) Expand all Loading... |
21 content::WebContents* web_contents, | 21 content::WebContents* web_contents, |
22 gfx::NativeWindow context, | 22 gfx::NativeWindow context, |
23 gfx::NativeWindow parent, | 23 gfx::NativeWindow parent, |
24 const base::string16& app_name, | 24 const base::string16& app_name, |
25 const base::string16& target_name, | 25 const base::string16& target_name, |
26 std::unique_ptr<DesktopMediaList> screen_list, | 26 std::unique_ptr<DesktopMediaList> screen_list, |
27 std::unique_ptr<DesktopMediaList> window_list, | 27 std::unique_ptr<DesktopMediaList> window_list, |
28 std::unique_ptr<DesktopMediaList> tab_list, | 28 std::unique_ptr<DesktopMediaList> tab_list, |
29 bool request_audio, | 29 bool request_audio, |
30 const DoneCallback& done_callback) { | 30 const DoneCallback& done_callback) { |
31 if (!base::CommandLine::ForCurrentProcess()->HasSwitch( | 31 if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
32 extensions::switches::kDisableDesktopCapturePickerOldUI)) { | 32 extensions::switches::kDisableDesktopCapturePickerNewUI)) { |
33 controller_deprecated_.reset([[DesktopMediaPickerControllerDeprecated alloc] | 33 controller_deprecated_.reset([[DesktopMediaPickerControllerDeprecated alloc] |
34 initWithScreenList:std::move(screen_list) | 34 initWithScreenList:std::move(screen_list) |
35 windowList:std::move(window_list) | 35 windowList:std::move(window_list) |
36 tabList:std::move(tab_list) | 36 tabList:std::move(tab_list) |
37 parent:parent | 37 parent:parent |
38 callback:done_callback | 38 callback:done_callback |
39 appName:app_name | 39 appName:app_name |
40 targetName:target_name | 40 targetName:target_name |
41 requestAudio:request_audio]); | 41 requestAudio:request_audio]); |
42 [controller_deprecated_ showWindow:nil]; | 42 [controller_deprecated_ showWindow:nil]; |
43 return; | 43 return; |
44 } | 44 } |
45 | 45 |
46 controller_.reset([[DesktopMediaPickerController alloc] | 46 controller_.reset([[DesktopMediaPickerController alloc] |
47 initWithScreenList:std::move(screen_list) | 47 initWithScreenList:std::move(screen_list) |
48 windowList:std::move(window_list) | 48 windowList:std::move(window_list) |
49 tabList:std::move(tab_list) | 49 tabList:std::move(tab_list) |
50 parent:parent | 50 parent:parent |
51 callback:done_callback | 51 callback:done_callback |
52 appName:app_name | 52 appName:app_name |
53 targetName:target_name | 53 targetName:target_name |
54 requestAudio:request_audio]); | 54 requestAudio:request_audio]); |
55 [controller_ showWindow:nil]; | 55 [controller_ showWindow:nil]; |
56 } | 56 } |
57 | 57 |
58 // static | 58 // static |
59 std::unique_ptr<DesktopMediaPicker> DesktopMediaPicker::Create() { | 59 std::unique_ptr<DesktopMediaPicker> DesktopMediaPicker::Create() { |
60 return std::unique_ptr<DesktopMediaPicker>(new DesktopMediaPickerCocoa()); | 60 return std::unique_ptr<DesktopMediaPicker>(new DesktopMediaPickerCocoa()); |
61 } | 61 } |
OLD | NEW |