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

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

Issue 2801553002: Remove IsUserAcceptAllowed check from storing media permission decision (Closed)
Patch Set: Remove IsUserAcceptAllowed check from storing permission decision Created 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | 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_stream_devices_controller.cc
diff --git a/chrome/browser/media/webrtc/media_stream_devices_controller.cc b/chrome/browser/media/webrtc/media_stream_devices_controller.cc
index 31119bf51972bb1ea041bc369056549fbc56bf6a..b24b64a0ac41dc742313a8889e717ac3891e3a02 100644
--- a/chrome/browser/media/webrtc/media_stream_devices_controller.cc
+++ b/chrome/browser/media/webrtc/media_stream_devices_controller.cc
@@ -746,14 +746,8 @@ ContentSetting MediaStreamDevicesController::GetNewSetting(
DCHECK(user_decision == CONTENT_SETTING_ALLOW ||
user_decision == CONTENT_SETTING_BLOCK);
ContentSetting result = old_setting;
- if (old_setting == CONTENT_SETTING_ASK) {
- if (user_decision == CONTENT_SETTING_ALLOW &&
- IsUserAcceptAllowed(content_type)) {
- result = CONTENT_SETTING_ALLOW;
- } else if (user_decision == CONTENT_SETTING_BLOCK) {
- result = CONTENT_SETTING_BLOCK;
- }
- }
+ if (old_setting == CONTENT_SETTING_ASK)
+ result = user_decision;
return result;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698