chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc - Issue 1099453005: Switch web API/permission code to use IsOriginSecure() instead of SchemeIsSecure().

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_api.cc

Issue 1099453005: Switch web API/permission code to use IsOriginSecure() instead of SchemeIsSecure(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Change WalletServiceUrl::IsSignInContinueUrl to use SchemeIsCryptographic. Created 5 years, 7 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/content_settings/permission_context_uma_util.cc ('k') | chrome/browser/media/media_capture_devices_dispatcher.cc » ('j') | chrome/browser/ui/content_settings/content_setting_bubble_model.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index d3c8ad4c0f89447488296870c0d90755f1c163b9..34fb4dd876db9328b4468e1684116983f8099afc 100644

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

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

@@ -21,6 +21,7 @@

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

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

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

+#include "content/public/common/origin_util.h"

#include "net/base/net_util.h"

#include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h"

#include "third_party/webrtc/modules/desktop_capture/screen_capturer.h"

@@ -107,12 +108,13 @@ bool DesktopCaptureChooseDesktopMediaFunction::RunAsync() {

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

switches::kAllowHttpScreenCapture) &&

- !origin_.SchemeIsSecure()) {

+ !IsOriginSecure(origin_)) {

error_ = kTabUrlNotSecure;

return false;

}

- target_name = base::UTF8ToUTF16(origin_.SchemeIsSecure() ?

- net::GetHostAndOptionalPort(origin_) : origin_.spec());

+ target_name = base::UTF8ToUTF16(IsOriginSecure(origin_)

+ ? net::GetHostAndOptionalPort(origin_)

+ : origin_.spec());

if (!params->target_tab->id) {

error_ = kNoTabIdError;