Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4868)

Unified Diff: chrome/browser/content_settings/permission_context_base.cc

Issue 1082083004: Replace some GURL::SchemeIsSecure callers with SchemeUsesTLS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@origin-is-secure-gurl
Patch Set: Created 5 years, 8 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
Index: chrome/browser/content_settings/permission_context_base.cc
diff --git a/chrome/browser/content_settings/permission_context_base.cc b/chrome/browser/content_settings/permission_context_base.cc
index a011d568d476c42cd084cbf0ba2959f4194a5132..ede79e3397250393c267cd5485c17e20a2c92dfb 100644
--- a/chrome/browser/content_settings/permission_context_base.cc
+++ b/chrome/browser/content_settings/permission_context_base.cc
@@ -11,13 +11,13 @@
#include "chrome/browser/content_settings/permission_queue_controller.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/website_settings/permission_bubble_manager.h"
+#include "chrome/common/origin_util.h"
#include "chrome/common/pref_names.h"
#include "components/content_settings/core/browser/content_settings_utils.h"
#include "components/content_settings/core/browser/host_content_settings_map.h"
#include "components/content_settings/core/common/permission_request_id.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/web_contents.h"
-#include "net/base/net_util.h"
PermissionContextBase::PermissionContextBase(
Profile* profile,
@@ -105,12 +105,9 @@ void PermissionContextBase::DecidePermission(
return;
}
- // The Web MIDI API is not available for origin with non secure schemes.
- // Access to the MIDI API is blocked.
- // TODO(crbug.com/362214): Use a standard way to check the secure origin.
+ // The Web MIDI SYSEX API is only available to secure origins.
if (permission_type_ == CONTENT_SETTINGS_TYPE_MIDI_SYSEX &&
- !requesting_origin.SchemeIsSecure() &&
- !net::IsLocalhost(requesting_origin.host())) {
+ !IsOriginSecure(requesting_origin)) {
NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
false /* persist */, CONTENT_SETTING_BLOCK);
return;
« no previous file with comments | « chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc ('k') | chrome/browser/net/certificate_error_reporter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698