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

Unified Diff: chrome/browser/ui/cocoa/media_picker/desktop_media_picker_cocoa.mm

Issue 2072003002: Desktop Capture Picker Window New UI For Mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 6 months 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 side-by-side diff with in-line comments
Download patch
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 d777da47d5263d7e8c0275f35b9238e9344b3fc5..4fdcc76bdaacb9e628dbe673f223c0141d896095 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,7 +6,10 @@
#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() {
}
@@ -25,6 +28,21 @@ void DesktopMediaPickerCocoa::Show(
std::unique_ptr<DesktopMediaList> tab_list,
bool request_audio,
const DoneCallback& done_callback) {
+ if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+ extensions::switches::kDisableDesktopCapturePickerOldUI)) {
+ 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)

Powered by Google App Engine
This is Rietveld 408576698