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

Index: chrome/browser/content_settings/permission_context_uma_util.cc

diff --git a/chrome/browser/content_settings/permission_context_uma_util.cc b/chrome/browser/content_settings/permission_context_uma_util.cc

index dd4c827669b642856dd3e9831ce70ec935b9651b..6341cf69b502626c739b7a5ed0221eebc8fba52e 100644

--- a/chrome/browser/content_settings/permission_context_uma_util.cc

+++ b/chrome/browser/content_settings/permission_context_uma_util.cc

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

#include "chrome/browser/content_settings/permission_context_uma_util.h"

#include "components/rappor/rappor_utils.h"

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

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

#include "url/gurl.h"

// UMA keys need to be statically initialized so plain function would not

@@ -80,7 +81,7 @@ const std::string GetRapporMetric(ContentSettingsType permission,

void RecordPermissionAction(ContentSettingsType permission,

PermissionAction action,

const GURL& requesting_origin) {

- bool secure_origin = requesting_origin.SchemeIsSecure();

+ bool secure_origin = content::IsOriginSecure(requesting_origin);

switch (permission) {

case CONTENT_SETTINGS_TYPE_GEOLOCATION:

@@ -138,7 +139,7 @@ void RecordPermissionAction(ContentSettingsType permission,

void RecordPermissionRequest(ContentSettingsType permission,

const GURL& requesting_origin) {

- bool secure_origin = requesting_origin.SchemeIsSecure();

+ bool secure_origin = content::IsOriginSecure(requesting_origin);

content::PermissionType type;

switch (permission) {

case CONTENT_SETTINGS_TYPE_GEOLOCATION: