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

Side by Side Diff: chrome/browser/content_settings/permission_context_base.cc

Issue 1050063002: Web MIDI: allow http://localhost to prompt sysex permission (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/content_settings/permission_context_base.h" 5 #include "chrome/browser/content_settings/permission_context_base.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "chrome/browser/content_settings/permission_bubble_request_impl.h" 9 #include "chrome/browser/content_settings/permission_bubble_request_impl.h"
10 #include "chrome/browser/content_settings/permission_context_uma_util.h" 10 #include "chrome/browser/content_settings/permission_context_uma_util.h"
11 #include "chrome/browser/content_settings/permission_queue_controller.h" 11 #include "chrome/browser/content_settings/permission_queue_controller.h"
12 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h" 13 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h"
14 #include "chrome/common/pref_names.h" 14 #include "chrome/common/pref_names.h"
15 #include "components/content_settings/core/browser/content_settings_utils.h" 15 #include "components/content_settings/core/browser/content_settings_utils.h"
16 #include "components/content_settings/core/browser/host_content_settings_map.h" 16 #include "components/content_settings/core/browser/host_content_settings_map.h"
17 #include "components/content_settings/core/common/permission_request_id.h" 17 #include "components/content_settings/core/common/permission_request_id.h"
18 #include "content/public/browser/browser_thread.h" 18 #include "content/public/browser/browser_thread.h"
19 #include "content/public/browser/web_contents.h" 19 #include "content/public/browser/web_contents.h"
20 #include "net/base/net_util.h"
20 21
21 PermissionContextBase::PermissionContextBase( 22 PermissionContextBase::PermissionContextBase(
22 Profile* profile, 23 Profile* profile,
23 const ContentSettingsType permission_type) 24 const ContentSettingsType permission_type)
24 : profile_(profile), 25 : profile_(profile),
25 permission_type_(permission_type), 26 permission_type_(permission_type),
26 weak_factory_(this) { 27 weak_factory_(this) {
27 permission_queue_controller_.reset( 28 permission_queue_controller_.reset(
28 new PermissionQueueController(profile_, permission_type_)); 29 new PermissionQueueController(profile_, permission_type_));
29 } 30 }
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 << "," << embedding_origin 100 << "," << embedding_origin
100 << " (" << content_settings::GetTypeName(permission_type_) 101 << " (" << content_settings::GetTypeName(permission_type_)
101 << " is not supported in popups)"; 102 << " is not supported in popups)";
102 NotifyPermissionSet(id, requesting_origin, embedding_origin, callback, 103 NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
103 false /* persist */, CONTENT_SETTING_BLOCK); 104 false /* persist */, CONTENT_SETTING_BLOCK);
104 return; 105 return;
105 } 106 }
106 107
107 // The Web MIDI API is not available for origin with non secure schemes. 108 // The Web MIDI API is not available for origin with non secure schemes.
108 // Access to the MIDI API is blocked. 109 // Access to the MIDI API is blocked.
110 // TODO(crbug.com/362214): Use a standard way to check the secure origin.
109 if (permission_type_ == CONTENT_SETTINGS_TYPE_MIDI_SYSEX && 111 if (permission_type_ == CONTENT_SETTINGS_TYPE_MIDI_SYSEX &&
110 !requesting_origin.SchemeIsSecure()) { 112 !requesting_origin.SchemeIsSecure() &&
113 !net::IsLocalhost(requesting_origin.host())) {
111 NotifyPermissionSet(id, requesting_origin, embedding_origin, callback, 114 NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
112 false /* persist */, CONTENT_SETTING_BLOCK); 115 false /* persist */, CONTENT_SETTING_BLOCK);
113 return; 116 return;
114 } 117 }
115 118
116 ContentSetting content_setting = 119 ContentSetting content_setting =
117 profile_->GetHostContentSettingsMap() 120 profile_->GetHostContentSettingsMap()
118 ->GetContentSettingAndMaybeUpdateLastUsage( 121 ->GetContentSettingAndMaybeUpdateLastUsage(
119 requesting_origin, embedding_origin, permission_type_, 122 requesting_origin, embedding_origin, permission_type_,
120 std::string()); 123 std::string());
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 DCHECK_EQ(requesting_origin, requesting_origin.GetOrigin()); 246 DCHECK_EQ(requesting_origin, requesting_origin.GetOrigin());
244 DCHECK_EQ(embedding_origin, embedding_origin.GetOrigin()); 247 DCHECK_EQ(embedding_origin, embedding_origin.GetOrigin());
245 DCHECK(content_setting == CONTENT_SETTING_ALLOW || 248 DCHECK(content_setting == CONTENT_SETTING_ALLOW ||
246 content_setting == CONTENT_SETTING_BLOCK); 249 content_setting == CONTENT_SETTING_BLOCK);
247 250
248 profile_->GetHostContentSettingsMap()->SetContentSetting( 251 profile_->GetHostContentSettingsMap()->SetContentSetting(
249 ContentSettingsPattern::FromURLNoWildcard(requesting_origin), 252 ContentSettingsPattern::FromURLNoWildcard(requesting_origin),
250 ContentSettingsPattern::FromURLNoWildcard(embedding_origin), 253 ContentSettingsPattern::FromURLNoWildcard(embedding_origin),
251 permission_type_, std::string(), content_setting); 254 permission_type_, std::string(), content_setting);
252 } 255 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698