| 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 8f197beb831ebd59623565c26ea5d906af1fc473..d777da47d5263d7e8c0275f35b9238e9344b3fc5 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
|
| @@ -6,10 +6,7 @@
|
|
|
| #include <utility>
|
|
|
| -#include "base/command_line.h"
|
| -#import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_deprecated.h"
|
| #import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.h"
|
| -#include "extensions/common/switches.h"
|
|
|
| DesktopMediaPickerCocoa::DesktopMediaPickerCocoa() {
|
| }
|
| @@ -28,21 +25,6 @@ void DesktopMediaPickerCocoa::Show(
|
| std::unique_ptr<DesktopMediaList> tab_list,
|
| bool request_audio,
|
| const DoneCallback& done_callback) {
|
| - if (base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| - extensions::switches::kDisableDesktopCapturePickerNewUI)) {
|
| - controller_deprecated_.reset([[DesktopMediaPickerControllerDeprecated alloc]
|
| - initWithScreenList:std::move(screen_list)
|
| - windowList:std::move(window_list)
|
| - tabList:std::move(tab_list)
|
| - parent:parent
|
| - callback:done_callback
|
| - appName:app_name
|
| - targetName:target_name
|
| - requestAudio:request_audio]);
|
| - [controller_deprecated_ showWindow:nil];
|
| - return;
|
| - }
|
| -
|
| controller_.reset([[DesktopMediaPickerController alloc]
|
| initWithScreenList:std::move(screen_list)
|
| windowList:std::move(window_list)
|
|
|