| 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" |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 | 93 |
| 94 return setting; | 94 return setting; |
| 95 } | 95 } |
| 96 | 96 |
| 97 void MediaStreamDevicePermissionContext::ResetPermission( | 97 void MediaStreamDevicePermissionContext::ResetPermission( |
| 98 const GURL& requesting_origin, | 98 const GURL& requesting_origin, |
| 99 const GURL& embedding_origin) { | 99 const GURL& embedding_origin) { |
| 100 NOTREACHED() << "ResetPermission is not implemented"; | 100 NOTREACHED() << "ResetPermission is not implemented"; |
| 101 } | 101 } |
| 102 | 102 |
| 103 void MediaStreamDevicePermissionContext::CancelPermissionRequest( | |
| 104 content::WebContents* web_contents, | |
| 105 const PermissionRequestID& id) { | |
| 106 NOTREACHED() << "CancelPermissionRequest is not implemented"; | |
| 107 } | |
| 108 | |
| 109 bool MediaStreamDevicePermissionContext::IsRestrictedToSecureOrigins() const { | 103 bool MediaStreamDevicePermissionContext::IsRestrictedToSecureOrigins() const { |
| 110 return base::FeatureList::IsEnabled( | 104 return base::FeatureList::IsEnabled( |
| 111 features::kRequireSecureOriginsForPepperMediaRequests); | 105 features::kRequireSecureOriginsForPepperMediaRequests); |
| 112 } | 106 } |
| OLD | NEW |