| Index: chrome/browser/chromeos/login/ui/webui_login_view.cc
|
| diff --git a/chrome/browser/chromeos/login/ui/webui_login_view.cc b/chrome/browser/chromeos/login/ui/webui_login_view.cc
|
| index 172bd19d8e15d36c1a9a46d82d756bc011a578a8..eb1f3ebd7ad28e182c2f0e0f6fb0b0682f802a36 100644
|
| --- a/chrome/browser/chromeos/login/ui/webui_login_view.cc
|
| +++ b/chrome/browser/chromeos/login/ui/webui_login_view.cc
|
| @@ -28,7 +28,6 @@
|
| #include "chrome/browser/chromeos/login/ui/web_contents_set_background_color.h"
|
| #include "chrome/browser/chromeos/login/ui/webui_login_display.h"
|
| #include "chrome/browser/chromeos/profiles/profile_helper.h"
|
| -#include "chrome/browser/chromeos/settings/cros_settings.h"
|
| #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
|
| #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h"
|
| #include "chrome/browser/media/webrtc/media_stream_devices_controller.h"
|
| @@ -43,7 +42,6 @@
|
| #include "chromeos/dbus/session_manager_client.h"
|
| #include "chromeos/network/network_state.h"
|
| #include "chromeos/network/network_state_handler.h"
|
| -#include "chromeos/settings/cros_settings_names.h"
|
| #include "components/content_settings/core/common/content_settings_pattern.h"
|
| #include "components/password_manager/core/browser/password_manager.h"
|
| #include "components/web_modal/web_contents_modal_dialog_manager.h"
|
| @@ -562,46 +560,9 @@ void WebUILoginView::RequestMediaAccessPermission(
|
| WebContents* web_contents,
|
| const content::MediaStreamRequest& request,
|
| const content::MediaResponseCallback& callback) {
|
| + // Note: This is only needed for SAML logins.
|
| MediaStreamDevicesController controller(web_contents, request, callback);
|
| - if (!controller.IsAskingForAudio() && !controller.IsAskingForVideo())
|
| - return;
|
| -
|
| - if (controller.IsAskingForAudio()) {
|
| - controller.PermissionDenied();
|
| - return;
|
| - }
|
| -
|
| - const CrosSettings* const settings = CrosSettings::Get();
|
| - if (!settings) {
|
| - controller.PermissionDenied();
|
| - return;
|
| - }
|
| -
|
| - const base::Value* const raw_list_value =
|
| - settings->GetPref(kLoginVideoCaptureAllowedUrls);
|
| - if (!raw_list_value) {
|
| - controller.PermissionDenied();
|
| - return;
|
| - }
|
| -
|
| - const base::ListValue* list_value;
|
| - CHECK(raw_list_value->GetAsList(&list_value));
|
| - for (const auto& base_value : *list_value) {
|
| - std::string value;
|
| - if (base_value->GetAsString(&value)) {
|
| - ContentSettingsPattern pattern =
|
| - ContentSettingsPattern::FromString(value);
|
| - if (pattern == ContentSettingsPattern::Wildcard()) {
|
| - LOG(WARNING) << "Ignoring wildcard URL pattern: " << value;
|
| - continue;
|
| - }
|
| - if (pattern.IsValid() && pattern.Matches(request.security_origin)) {
|
| - controller.PermissionGranted();
|
| - return;
|
| - }
|
| - }
|
| - }
|
| - controller.PermissionDenied();
|
| + DCHECK(!controller.IsAskingForAudio() && !controller.IsAskingForVideo());
|
| }
|
|
|
| bool WebUILoginView::CheckMediaAccessPermission(
|
|
|