diff options
| author | palmer <palmer@chromium.org> | 2015-04-17 14:09:23 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-17 21:09:40 +0000 |
| commit | 298d7eb01ab6f9c1f8781a31c2fddc13f9e4e4e2 (patch) | |
| tree | ccddaa5e8dde3bc7e87a134656eb42b357ab413c /chrome/browser | |
| parent | 6d2c9d9585a9184bb855dc3bbed81a25b3bf0dc8 (diff) | |
| download | chromium_src-298d7eb01ab6f9c1f8781a31c2fddc13f9e4e4e2.zip chromium_src-298d7eb01ab6f9c1f8781a31c2fddc13f9e4e4e2.tar.gz chromium_src-298d7eb01ab6f9c1f8781a31c2fddc13f9e4e4e2.tar.bz2 | |
Use IsOriginSecure when checking Web MIDI SYSEX capability.
Rather than the previous ad hoc check. IsOriginSecure is the standard way.
BUG=362214,470170
Review URL: https://codereview.chromium.org/1087983002
Cr-Commit-Position: refs/heads/master@{#325717}
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/content_settings/permission_context_base.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/chrome/browser/content_settings/permission_context_base.cc b/chrome/browser/content_settings/permission_context_base.cc index a011d56..ede79e3 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; |