OLD | NEW |
---|---|
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/media/webrtc/media_stream_device_permission_context.h" | 5 #include "chrome/browser/media/webrtc/media_stream_device_permission_context.h" |
6 #include "base/feature_list.h" | 6 #include "base/feature_list.h" |
7 #include "chrome/browser/media/webrtc/media_stream_device_permissions.h" | 7 #include "chrome/browser/media/webrtc/media_stream_device_permissions.h" |
8 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
9 #include "chrome/common/chrome_features.h" | 9 #include "chrome/common/chrome_features.h" |
10 #include "chrome/common/pref_names.h" | 10 #include "chrome/common/pref_names.h" |
11 #include "components/content_settings/core/browser/host_content_settings_map.h" | 11 #include "components/content_settings/core/browser/host_content_settings_map.h" |
12 #include "components/content_settings/core/common/content_settings.h" | 12 #include "components/content_settings/core/common/content_settings.h" |
13 #include "content/public/common/content_features.h" | 13 #include "content/public/common/content_features.h" |
14 #include "content/public/common/url_constants.h" | 14 #include "content/public/common/url_constants.h" |
15 #include "extensions/common/constants.h" | 15 #include "extensions/common/constants.h" |
16 | 16 |
17 namespace { | |
18 | |
19 blink::WebFeaturePolicyFeature GetFeaturePolicyFeature( | |
20 ContentSettingsType type) { | |
21 if (type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC) { | |
22 return blink::WebFeaturePolicyFeature::kMicrophone; | |
23 } else { | |
Sergey Ulanov
2017/05/30 18:21:06
No else after return, please https://chromium.goog
raymes
2017/05/31 07:07:54
Done.
| |
24 DCHECK_EQ(CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, type); | |
25 return blink::WebFeaturePolicyFeature::kCamera; | |
26 } | |
27 } | |
28 | |
29 } // namespace | |
30 | |
17 MediaStreamDevicePermissionContext::MediaStreamDevicePermissionContext( | 31 MediaStreamDevicePermissionContext::MediaStreamDevicePermissionContext( |
18 Profile* profile, | 32 Profile* profile, |
19 const ContentSettingsType content_settings_type) | 33 const ContentSettingsType content_settings_type) |
20 : PermissionContextBase(profile, content_settings_type), | 34 : PermissionContextBase(profile, |
35 content_settings_type, | |
36 GetFeaturePolicyFeature(content_settings_type)), | |
21 content_settings_type_(content_settings_type) { | 37 content_settings_type_(content_settings_type) { |
22 DCHECK(content_settings_type_ == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC || | 38 DCHECK(content_settings_type_ == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC || |
23 content_settings_type_ == CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA); | 39 content_settings_type_ == CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA); |
24 } | 40 } |
25 | 41 |
26 MediaStreamDevicePermissionContext::~MediaStreamDevicePermissionContext() {} | 42 MediaStreamDevicePermissionContext::~MediaStreamDevicePermissionContext() {} |
27 | 43 |
28 void MediaStreamDevicePermissionContext::DecidePermission( | 44 void MediaStreamDevicePermissionContext::DecidePermission( |
29 content::WebContents* web_contents, | 45 content::WebContents* web_contents, |
30 const PermissionRequestID& id, | 46 const PermissionRequestID& id, |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
88 void MediaStreamDevicePermissionContext::CancelPermissionRequest( | 104 void MediaStreamDevicePermissionContext::CancelPermissionRequest( |
89 content::WebContents* web_contents, | 105 content::WebContents* web_contents, |
90 const PermissionRequestID& id) { | 106 const PermissionRequestID& id) { |
91 NOTREACHED() << "CancelPermissionRequest is not implemented"; | 107 NOTREACHED() << "CancelPermissionRequest is not implemented"; |
92 } | 108 } |
93 | 109 |
94 bool MediaStreamDevicePermissionContext::IsRestrictedToSecureOrigins() const { | 110 bool MediaStreamDevicePermissionContext::IsRestrictedToSecureOrigins() const { |
95 return base::FeatureList::IsEnabled( | 111 return base::FeatureList::IsEnabled( |
96 features::kRequireSecureOriginsForPepperMediaRequests); | 112 features::kRequireSecureOriginsForPepperMediaRequests); |
97 } | 113 } |
OLD | NEW |