chrome/browser/ui/website_settings/permission_menu_model.cc - Issue 1099453005: Switch web API/permission 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/website_settings/permission_menu_model.cc

Issue 1099453005: Switch web API/permission code to use IsOriginSecure() instead of SchemeIsSecure(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Change WalletServiceUrl::IsSignInContinueUrl to use SchemeIsCryptographic. 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

« chrome/browser/ui/content_settings/content_setting_bubble_model.cc ('K') | « chrome/browser/ui/content_settings/content_setting_bubble_model.cc ('k') | components/autofill/content/browser/wallet/wallet_service_url_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/website_settings/permission_menu_model.cc

diff --git a/chrome/browser/ui/website_settings/permission_menu_model.cc b/chrome/browser/ui/website_settings/permission_menu_model.cc

index 19a39f93c6a263f695892bea6e7c9889da01e900..b2467125295f3320a8c64906eb19cb3d619bacba 100644

--- a/chrome/browser/ui/website_settings/permission_menu_model.cc

+++ b/chrome/browser/ui/website_settings/permission_menu_model.cc

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

#include "chrome/grit/generated_resources.h"

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

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

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

PermissionMenuModel::PermissionMenuModel(

@@ -59,7 +60,7 @@ PermissionMenuModel::PermissionMenuModel(

// Media only support CONTENT_SETTTING_ALLOW for https.

if ((permission_.type != CONTENT_SETTINGS_TYPE_MEDIASTREAM ||

- url.SchemeIsSecure()) &&

+ IsOriginSecure(url)) &&

!is_exclusive_access_on_file) {

label = l10n_util::GetStringUTF16(

IDS_WEBSITE_SETTINGS_MENU_ITEM_ALLOW);