Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(558)

Side by Side Diff: chrome/browser/ui/cocoa/media_picker/desktop_media_picker_cocoa.mm

Issue 2560333002: Remove Deprecate Code For Desktop Capture Picker Old UI (Closed)
Patch Set: Rebase Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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"
10 #import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_de precated.h"
11 #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"
12 #include "extensions/common/switches.h"
13 10
14 DesktopMediaPickerCocoa::DesktopMediaPickerCocoa() { 11 DesktopMediaPickerCocoa::DesktopMediaPickerCocoa() {
15 } 12 }
16 13
17 DesktopMediaPickerCocoa::~DesktopMediaPickerCocoa() { 14 DesktopMediaPickerCocoa::~DesktopMediaPickerCocoa() {
18 } 15 }
19 16
20 void DesktopMediaPickerCocoa::Show( 17 void DesktopMediaPickerCocoa::Show(
21 content::WebContents* web_contents, 18 content::WebContents* web_contents,
22 gfx::NativeWindow context, 19 gfx::NativeWindow context,
23 gfx::NativeWindow parent, 20 gfx::NativeWindow parent,
24 const base::string16& app_name, 21 const base::string16& app_name,
25 const base::string16& target_name, 22 const base::string16& target_name,
26 std::unique_ptr<DesktopMediaList> screen_list, 23 std::unique_ptr<DesktopMediaList> screen_list,
27 std::unique_ptr<DesktopMediaList> window_list, 24 std::unique_ptr<DesktopMediaList> window_list,
28 std::unique_ptr<DesktopMediaList> tab_list, 25 std::unique_ptr<DesktopMediaList> tab_list,
29 bool request_audio, 26 bool request_audio,
30 const DoneCallback& done_callback) { 27 const DoneCallback& done_callback) {
31 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
32 extensions::switches::kDisableDesktopCapturePickerNewUI)) {
33 controller_deprecated_.reset([[DesktopMediaPickerControllerDeprecated alloc]
34 initWithScreenList:std::move(screen_list)
35 windowList:std::move(window_list)
36 tabList:std::move(tab_list)
37 parent:parent
38 callback:done_callback
39 appName:app_name
40 targetName:target_name
41 requestAudio:request_audio]);
42 [controller_deprecated_ showWindow:nil];
43 return;
44 }
45
46 controller_.reset([[DesktopMediaPickerController alloc] 28 controller_.reset([[DesktopMediaPickerController alloc]
47 initWithScreenList:std::move(screen_list) 29 initWithScreenList:std::move(screen_list)
48 windowList:std::move(window_list) 30 windowList:std::move(window_list)
49 tabList:std::move(tab_list) 31 tabList:std::move(tab_list)
50 parent:parent 32 parent:parent
51 callback:done_callback 33 callback:done_callback
52 appName:app_name 34 appName:app_name
53 targetName:target_name 35 targetName:target_name
54 requestAudio:request_audio]); 36 requestAudio:request_audio]);
55 [controller_ showWindow:nil]; 37 [controller_ showWindow:nil];
56 } 38 }
57 39
58 // static 40 // static
59 std::unique_ptr<DesktopMediaPicker> DesktopMediaPicker::Create() { 41 std::unique_ptr<DesktopMediaPicker> DesktopMediaPicker::Create() {
60 return std::unique_ptr<DesktopMediaPicker>(new DesktopMediaPickerCocoa()); 42 return std::unique_ptr<DesktopMediaPicker>(new DesktopMediaPickerCocoa());
61 } 43 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698