chrome/browser/media/media_stream_infobar_delegate.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_infobar_delegate.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/media_stream_device_permissions.cc ('K') | « chrome/browser/media/media_stream_devices_controller.cc ('k') | chrome/browser/media/webrtc_browsertest_base.h » ('j') | chrome/browser/media/webrtc_browsertest_base.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media/media_stream_infobar_delegate.cc

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

index 46b95641d7496b1fc977e5a78db62985287c4354..9f22e0726fce434f40fda6be17497ce07acd8cbe 100644

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

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

@@ -13,6 +13,7 @@

#include "components/google/core/browser/google_util.h"

#include "components/infobars/core/infobar.h"

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

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

#include "grit/components_strings.h"

#include "grit/theme_resources.h"

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

@@ -123,7 +124,7 @@ base::string16 MediaStreamInfoBarDelegate::GetButtonLabel(

bool MediaStreamInfoBarDelegate::Accept() {

GURL origin(controller_->GetSecurityOriginSpec());

- if (origin.SchemeIsSecure()) {

+ if (content::IsOriginSecure(origin)) {

UMA_HISTOGRAM_ENUMERATION("Media.DevicePermissionActions",

kAllowHttps, kPermissionActionsMax);

} else {