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

Side by Side Diff: chrome/browser/media/webrtc/media_stream_device_permission_context.cc

Issue 2675483002: Replace PermissionType in chrome/ with ContentSettingsType (Closed)
Patch Set: rebase + include content_settings_types.h more Created 3 years, 10 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
OLDNEW
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 "chrome/browser/media/webrtc/media_stream_device_permissions.h" 6 #include "chrome/browser/media/webrtc/media_stream_device_permissions.h"
7 #include "chrome/browser/profiles/profile.h" 7 #include "chrome/browser/profiles/profile.h"
8 #include "chrome/common/pref_names.h" 8 #include "chrome/common/pref_names.h"
9 #include "components/content_settings/core/browser/host_content_settings_map.h" 9 #include "components/content_settings/core/browser/host_content_settings_map.h"
10 #include "components/content_settings/core/common/content_settings.h" 10 #include "components/content_settings/core/common/content_settings.h"
11 #include "content/public/common/url_constants.h" 11 #include "content/public/common/url_constants.h"
12 #include "extensions/common/constants.h" 12 #include "extensions/common/constants.h"
13 13
14 MediaStreamDevicePermissionContext::MediaStreamDevicePermissionContext( 14 MediaStreamDevicePermissionContext::MediaStreamDevicePermissionContext(
15 Profile* profile, 15 Profile* profile,
16 const content::PermissionType permission_type,
17 const ContentSettingsType content_settings_type) 16 const ContentSettingsType content_settings_type)
18 : PermissionContextBase(profile, permission_type, content_settings_type), 17 : PermissionContextBase(profile, content_settings_type),
19 content_settings_type_(content_settings_type) { 18 content_settings_type_(content_settings_type) {
20 DCHECK(content_settings_type_ == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC || 19 DCHECK(content_settings_type_ == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC ||
21 content_settings_type_ == CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA); 20 content_settings_type_ == CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA);
22 } 21 }
23 22
24 MediaStreamDevicePermissionContext::~MediaStreamDevicePermissionContext() {} 23 MediaStreamDevicePermissionContext::~MediaStreamDevicePermissionContext() {}
25 24
26 void MediaStreamDevicePermissionContext::RequestPermission( 25 void MediaStreamDevicePermissionContext::RequestPermission(
27 content::WebContents* web_contents, 26 content::WebContents* web_contents,
28 const PermissionRequestID& id, 27 const PermissionRequestID& id,
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 const PermissionRequestID& id) { 82 const PermissionRequestID& id) {
84 NOTREACHED() << "CancelPermissionRequest is not implemented"; 83 NOTREACHED() << "CancelPermissionRequest is not implemented";
85 } 84 }
86 85
87 bool MediaStreamDevicePermissionContext::IsRestrictedToSecureOrigins() const { 86 bool MediaStreamDevicePermissionContext::IsRestrictedToSecureOrigins() const {
88 // Flash currently doesn't require secure origin to use mic/camera. If we 87 // Flash currently doesn't require secure origin to use mic/camera. If we
89 // return true here, it'll break the use case like http://tinychat.com. 88 // return true here, it'll break the use case like http://tinychat.com.
90 // TODO(raymes): Change this to true after crbug.com/526324 is fixed. 89 // TODO(raymes): Change this to true after crbug.com/526324 is fixed.
91 return false; 90 return false;
92 } 91 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698