chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc - Issue 1131993005: Switch //chrome/browser 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 1131993005: Switch //chrome/browser code to use IsOriginSecure() instead of SchemeIsSecure(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebasin' like it's mah job. 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/ui/content_settings/content_setting_bubble_model.cc » ('j') | no next file with comments »
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 70cf9d54bd2a9b837e0a529cd39f1aaa62d17229..58bd7605339b1025c049291f5b0ab663815eefe7 100644

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

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

@@ -12,6 +12,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"

namespace extensions {

@@ -66,11 +67,11 @@ bool DesktopCaptureChooseDesktopMediaFunction::RunAsync() {

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

switches::kAllowHttpScreenCapture) &&

- !origin.SchemeIsSecure()) {

+ !content::IsOriginSecure(origin)) {

error_ = kTabUrlNotSecure;

return false;

}

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

+ target_name = base::UTF8ToUTF16(content::IsOriginSecure(origin) ?

net::GetHostAndOptionalPort(origin) : origin.spec());

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