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

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

Issue 1880693002: Desktop Capture Picker New UI: Preliminary Refactor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nit Created 4 years, 8 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 e46f2ac3e5906aa3cdb0b8a6c8147041a5479578..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
@@ -14,21 +14,26 @@ DesktopMediaPickerCocoa::DesktopMediaPickerCocoa() {
DesktopMediaPickerCocoa::~DesktopMediaPickerCocoa() {
}
-void DesktopMediaPickerCocoa::Show(content::WebContents* web_contents,
- gfx::NativeWindow context,
- gfx::NativeWindow parent,
- const base::string16& app_name,
- const base::string16& target_name,
- std::unique_ptr<DesktopMediaList> media_list,
- bool request_audio,
- const DoneCallback& done_callback) {
+void DesktopMediaPickerCocoa::Show(
+ content::WebContents* web_contents,
+ gfx::NativeWindow context,
+ gfx::NativeWindow parent,
+ const base::string16& app_name,
+ const base::string16& target_name,
+ std::unique_ptr<DesktopMediaList> screen_list,
+ std::unique_ptr<DesktopMediaList> window_list,
+ std::unique_ptr<DesktopMediaList> tab_list,
+ bool request_audio,
+ const DoneCallback& done_callback) {
controller_.reset([[DesktopMediaPickerController alloc]
- initWithMediaList:std::move(media_list)
- parent:parent
- callback:done_callback
- appName:app_name
- targetName:target_name
- requestAudio:request_audio]);
+ 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_ showWindow:nil];
}

Powered by Google App Engine
This is Rietveld 408576698