chrome/browser/ui/content_settings/content_setting_bubble_model.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/ui/content_settings/content_setting_bubble_model.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/extensions/api/desktop_capture/desktop_capture_api.cc ('k') | chrome/browser/ui/website_settings/permission_menu_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/content_settings/content_setting_bubble_model.cc

diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc

index 3d9d4e1d888a0e0e3dbca3b70d688e8038e92395..bdc7df799563be57ae400c71306f41395bd38395 100644

--- a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc

+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc

@@ -35,6 +35,7 @@

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

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

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

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

#include "grit/components_strings.h"

#include "grit/theme_resources.h"

#include "net/base/net_util.h"

@@ -700,7 +701,7 @@ void ContentSettingMediaStreamBubbleModel::SetRadioGroup() {

int radio_block_label_id = 0;

if (state_ & (TabSpecificContentSettings::MICROPHONE_BLOCKED |

TabSpecificContentSettings::CAMERA_BLOCKED)) {

- if (url.SchemeIsSecure()) {

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

radio_item_setting_[0] = CONTENT_SETTING_ALLOW;

radio_allow_label_id = IDS_BLOCKED_MEDIASTREAM_CAMERA_ALLOW;

if (is_mic)