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

Side by Side Diff: chrome/browser/media/media_stream_device_permissions.cc

Issue 1099803003: [chrome/browser/media] favor DCHECK_CURRENTLY_ON for better logs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed build issue 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
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/media/media_stream_device_permissions.h" 5 #include "chrome/browser/media/media_stream_device_permissions.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 30 matching lines...) Expand all
41 DCHECK(type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC || 41 DCHECK(type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC ||
42 type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA); 42 type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA);
43 return profile->GetHostContentSettingsMap()->ShouldAllowAllContent( 43 return profile->GetHostContentSettingsMap()->ShouldAllowAllContent(
44 security_origin, security_origin, type); 44 security_origin, security_origin, type);
45 } 45 }
46 46
47 MediaStreamDevicePolicy GetDevicePolicy(Profile* profile, 47 MediaStreamDevicePolicy GetDevicePolicy(Profile* profile,
48 const GURL& security_origin, 48 const GURL& security_origin,
49 const char* policy_name, 49 const char* policy_name,
50 const char* whitelist_policy_name) { 50 const char* whitelist_policy_name) {
51 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); 51 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
52 52
53 // If the security origin policy matches a value in the whitelist, allow it. 53 // If the security origin policy matches a value in the whitelist, allow it.
54 // Otherwise, check the |policy_name| master switch for the default behavior. 54 // Otherwise, check the |policy_name| master switch for the default behavior.
55 55
56 PrefService* prefs = profile->GetPrefs(); 56 PrefService* prefs = profile->GetPrefs();
57 57
58 // TODO(tommi): Remove the kiosk mode check when the whitelist below 58 // TODO(tommi): Remove the kiosk mode check when the whitelist below
59 // is visible in the media exceptions UI. 59 // is visible in the media exceptions UI.
60 // See discussion here: https://codereview.chromium.org/15738004/ 60 // See discussion here: https://codereview.chromium.org/15738004/
61 if (IsInKioskMode()) { 61 if (IsInKioskMode()) {
(...skipping 16 matching lines...) Expand all
78 78
79 // If a match was not found, check if audio capture is otherwise disallowed 79 // If a match was not found, check if audio capture is otherwise disallowed
80 // or if the user should be prompted. Setting the policy value to "true" 80 // or if the user should be prompted. Setting the policy value to "true"
81 // is equal to not setting it at all, so from hereon out, we will return 81 // is equal to not setting it at all, so from hereon out, we will return
82 // either POLICY_NOT_SET (prompt) or ALWAYS_DENY (no prompt, no access). 82 // either POLICY_NOT_SET (prompt) or ALWAYS_DENY (no prompt, no access).
83 if (!prefs->GetBoolean(policy_name)) 83 if (!prefs->GetBoolean(policy_name))
84 return ALWAYS_DENY; 84 return ALWAYS_DENY;
85 85
86 return POLICY_NOT_SET; 86 return POLICY_NOT_SET;
87 } 87 }
OLDNEW
« no previous file with comments | « chrome/browser/media/media_device_id_salt.cc ('k') | chrome/browser/media/media_stream_devices_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698