chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc - Issue 2125063002: Make Desktop Capture New Feature Default On

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/extensions/api/desktop_capture/desktop_capture_base.cc

Issue 2125063002: Make Desktop Capture New Feature Default On (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove include Created 4 years, 5 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

« no previous file with comments | « chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc ('k') | chrome/browser/ui/cocoa/media_picker/desktop_media_picker_cocoa.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc

diff --git a/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc b/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc

index 82d24612d6c0c98c0dd5ace7f862ca7f4fc2b2d5..282cec5acbb40f8d2ebc39d91ebe301d45930f04 100644

--- a/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc

+++ b/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc

@@ -17,7 +17,6 @@

#include "chrome/browser/media/media_capture_devices_dispatcher.h"

#include "chrome/browser/media/native_desktop_media_list.h"

#include "chrome/browser/media/tab_desktop_media_list.h"

-#include "chrome/common/channel_info.h"

#include "components/version_info/version_info.h"

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

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

@@ -98,20 +97,9 @@ bool DesktopCaptureChooseDesktopMediaFunctionBase::Execute(

break;

case api::desktop_capture::DESKTOP_CAPTURE_SOURCE_TYPE_TAB:

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

- extensions::switches::kEnableTabForDesktopShare)) {

- show_tabs = true;

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

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

extensions::switches::kDisableTabForDesktopShare)) {

- show_tabs = false;

- } else {

- const version_info::Channel channel = chrome::GetChannel();

- if ((channel == version_info::Channel::STABLE) ||

- (channel == version_info::Channel::BETA)) {

- show_tabs = false;

- } else {

- show_tabs = true;

- }

+ show_tabs = true;

}

break;