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

Unified 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: Further remove CombinedDesktopMediaList 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 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 8f197beb831ebd59623565c26ea5d906af1fc473..24019fb5a1e5b1fb0b874a05f2ba56a3faba9a4a 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
@@ -7,7 +7,6 @@
#include <utility>
#include "base/command_line.h"
msw 2016/12/12 20:19:58 nit: remove
qiangchen 2016/12/12 20:41:28 Done.
-#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"
msw 2016/12/12 20:19:59 nit: remove
qiangchen 2016/12/12 20:41:28 Done.
@@ -28,21 +27,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]
msw 2016/12/12 20:19:58 Remove this member from desktop_media_picker_cocoa
qiangchen 2016/12/12 20:41:28 Done.
- 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