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

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

Issue 2941943002: Only enable kUsePermissionManagerForMediaRequests when the PermissionRequestManager is used (Closed)
Patch Set: Only enable kUsePermissionManagerForMediaRequests when the PermissionRequestManager is used Created 3 years, 6 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 ca998fe3a4a2e74f03c6f1bb56f869c233433346..7fd2557b628d43f26bbf5e21942173c48a93caf4 100644
--- a/chrome/browser/media/webrtc/media_stream_devices_controller.cc
+++ b/chrome/browser/media/webrtc/media_stream_devices_controller.cc
@@ -19,6 +19,7 @@
#include "chrome/browser/media/webrtc/media_stream_capture_indicator.h"
#include "chrome/browser/media/webrtc/media_stream_device_permissions.h"
#include "chrome/browser/permissions/permission_manager.h"
+#include "chrome/browser/permissions/permission_request_manager.h"
#include "chrome/browser/permissions/permission_result.h"
#include "chrome/browser/permissions/permission_uma_util.h"
#include "chrome/browser/permissions/permission_util.h"
@@ -53,7 +54,6 @@
#include "content/public/browser/android/content_view_core.h"
#include "ui/android/window_android.h"
#else // !defined(OS_ANDROID)
-#include "chrome/browser/permissions/permission_request_manager.h"
#include "ui/vector_icons/vector_icons.h"
#endif
@@ -465,7 +465,8 @@ void MediaStreamDevicesController::RequestPermissionsWithDelegate(
Profile* profile =
Profile::FromBrowserContext(web_contents->GetBrowserContext());
if (base::FeatureList::IsEnabled(
- features::kUsePermissionManagerForMediaRequests)) {
+ features::kUsePermissionManagerForMediaRequests) &&
+ PermissionRequestManager::IsEnabled()) {
std::vector<ContentSettingsType> content_settings_types;
if (is_asking_for_audio)
« 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