chrome/browser/media/media_stream_device_permissions.cc - Issue 1132203002: Switch media stream permissions 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/media/media_stream_device_permissions.cc

Issue 1132203002: Switch media stream permissions to use IsOriginSecure() instead of SchemeIsSecure(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Run `git cl format` again. Created 5 years, 4 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

« chrome/browser/media/chrome_media_stream_infobar_browsertest.cc ('K') | « chrome/browser/media/desktop_capture_access_handler.cc ('k') | chrome/browser/media/media_stream_devices_controller.cc » ('j') | chrome/browser/media/webrtc_browsertest_base.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media/media_stream_device_permissions.cc

diff --git a/chrome/browser/media/media_stream_device_permissions.cc b/chrome/browser/media/media_stream_device_permissions.cc

index cd37501c0c028d448fbc61bc63287409c38c6987..8414bde8c6044769d9e28a81902c4f850374417a 100644

--- a/chrome/browser/media/media_stream_device_permissions.cc

+++ b/chrome/browser/media/media_stream_device_permissions.cc

@@ -12,6 +12,7 @@

#include "components/content_settings/core/browser/host_content_settings_map.h"

#include "components/content_settings/core/common/content_settings_pattern.h"

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

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

#include "extensions/common/constants.h"

#include "url/gurl.h"

@@ -53,7 +54,7 @@ bool ShouldPersistContentSetting(ContentSetting setting,

return true;

// We persist requests from secure origins.

- if (origin.SchemeIsSecure())

+ if (content::IsOriginSecure(origin))

raymes 2015/08/05 02:31:05 You might get a merge conflict (or not) as I recen

lgarron 2015/08/06 22:10:09 Done.

return true;

return false;