chrome/browser/media/media_stream_devices_controller.cc - Issue 1276373004: Revert of 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_devices_controller.cc

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

Patch Set: 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

« no previous file with comments | « chrome/browser/media/media_stream_device_permissions.cc ('k') | chrome/browser/media/media_stream_infobar_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media/media_stream_devices_controller.cc

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

index f305de8eb56464ad0e20c9ee7a69d9cc98b34eb8..6da7f54a920f4cb32056d4278974d1f4be677e7c 100644

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

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

@@ -24,8 +24,6 @@

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

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

#include "content/public/common/media_stream_request.h"

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

-#include "extensions/common/constants.h"

#include "grit/theme_resources.h"

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

@@ -156,7 +154,7 @@

void MediaStreamDevicesController::PermissionGranted() {

GURL origin(GetSecurityOriginSpec());

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

+ if (origin.SchemeIsSecure()) {

UMA_HISTOGRAM_ENUMERATION("Media.DevicePermissionActions",

kAllowHttps, kPermissionActionsMax);

} else {

@@ -336,6 +334,7 @@

ContentSetting new_audio_setting,

ContentSetting new_video_setting) const {

DCHECK_CURRENTLY_ON(BrowserThread::UI);

ContentSettingsPattern primary_pattern =

ContentSettingsPattern::FromURLNoWildcard(request_.security_origin);

« no previous file with comments | « chrome/browser/media/media_stream_device_permissions.cc ('k') | chrome/browser/media/media_stream_infobar_delegate.cc » ('j') | no next file with comments »