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

Unified Diff: chrome/browser/media/webrtc/media_permission.cc

Issue 2779463002: Chrome OS: Fix taking user pictures to be used as user POD images. (Closed)
Patch Set: Created 3 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/login/ui/webui_login_view.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/media/webrtc/media_permission.cc
diff --git a/chrome/browser/media/webrtc/media_permission.cc b/chrome/browser/media/webrtc/media_permission.cc
index b330bdf238c4f0b5c81b29e33bcbdac7793de8e9..d0918a092e0c24f40ed7e98fcf6d57790aeb2d2c 100644
--- a/chrome/browser/media/webrtc/media_permission.cc
+++ b/chrome/browser/media/webrtc/media_permission.cc
@@ -69,6 +69,13 @@ ContentSetting MediaPermission::GetPermissionStatus(
return CONTENT_SETTING_BLOCK;
}
+ // When creating new user (including supervised user), we must
+ // be able to use photo for user image.
+ constexpr char pattern[] = "chrome://oobe/";
Sergey Ulanov 2017/03/29 23:26:17 Use kChromeUIOobeURL from chrome/common/url_consta
Alexander Alekseev 2017/03/30 02:04:34 Done.
+ if (requesting_origin_.possibly_invalid_spec() == pattern) {
Sergey Ulanov 2017/03/29 23:26:17 use spec() instead of possibly_invalid_spec() here
Alexander Alekseev 2017/03/30 02:04:34 Done.
+ return CONTENT_SETTING_ALLOW;
+ }
+
const chromeos::CrosSettings* const settings =
chromeos::CrosSettings::Get();
if (!settings) {
« no previous file with comments | « chrome/browser/chromeos/login/ui/webui_login_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698