chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc - Issue 2560333002: Remove Deprecate Code For Desktop Capture Picker Old UI

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc

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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_deprecated_unittest.mm ('k') | chrome/browser/ui/views/desktop_media_picker_views_deprecated.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc

diff --git a/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc b/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc

index d5bd2410732945710162e963ed0da03b3de58447..ef8760044b495588f991f79a761cf7c9057805d6 100644

--- a/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc

+++ b/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc

@@ -5,13 +5,11 @@

#include "chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.h"

#include "base/callback.h"

-#include "base/command_line.h"

#include "chrome/browser/media/webrtc/desktop_media_list.h"

#include "chrome/browser/ui/browser_finder.h"

#include "chrome/browser/ui/browser_window.h"

#include "chrome/browser/ui/views/desktop_capture/desktop_media_list_view.h"

#include "chrome/browser/ui/views/desktop_capture/desktop_media_source_view.h"

-#include "chrome/browser/ui/views/desktop_media_picker_views_deprecated.h"

#include "chrome/grit/chromium_strings.h"

#include "chrome/grit/generated_resources.h"

#include "components/constrained_window/constrained_window_views.h"

@@ -20,7 +18,6 @@

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/render_frame_host.h"

#include "content/public/browser/web_contents_delegate.h"

-#include "extensions/common/switches.h"

#include "ui/aura/window_tree_host.h"

#include "ui/base/l10n/l10n_util.h"

#include "ui/events/keycodes/keyboard_codes.h"

@@ -445,10 +442,5 @@ void DesktopMediaPickerViews::NotifyDialogResult(DesktopMediaID source) {

// static

std::unique_ptr<DesktopMediaPicker> DesktopMediaPicker::Create() {

- if (base::CommandLine::ForCurrentProcess()->HasSwitch(

- extensions::switches::kDisableDesktopCapturePickerNewUI)) {

- return std::unique_ptr<DesktopMediaPicker>(

- new deprecated::DesktopMediaPickerViews());

- }

return std::unique_ptr<DesktopMediaPicker>(new DesktopMediaPickerViews());

}