Commit d47cd7f2 authored by Evan Stade's avatar Evan Stade Committed by Commit Bot

Remove VR mode suppression of media router dialog.

Bug: 738196
Change-Id: Ibc6ab965ba80cbc76f7e89230da7c20bf7dc9392
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2364957Reviewed-by: default avatarmark a. foltz <mfoltz@chromium.org>
Commit-Queue: Evan Stade <estade@chromium.org>
Cr-Commit-Position: refs/heads/master@{#799844}
parent b9ad65a6
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
#include "chrome/browser/media/android/router/media_router_android.h" #include "chrome/browser/media/android/router/media_router_android.h"
#include "chrome/browser/media/router/media_router.h" #include "chrome/browser/media/router/media_router.h"
#include "chrome/browser/media/router/media_router_factory.h" #include "chrome/browser/media/router/media_router_factory.h"
#include "chrome/browser/vr/vr_tab_helper.h"
#include "chrome/common/media_router/media_source.h" #include "chrome/common/media_router/media_source.h"
#include "content/public/browser/browser_context.h" #include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_thread.h" #include "content/public/browser/browser_thread.h"
...@@ -139,14 +138,6 @@ MediaRouterDialogControllerAndroid::~MediaRouterDialogControllerAndroid() {} ...@@ -139,14 +138,6 @@ MediaRouterDialogControllerAndroid::~MediaRouterDialogControllerAndroid() {}
void MediaRouterDialogControllerAndroid::CreateMediaRouterDialog( void MediaRouterDialogControllerAndroid::CreateMediaRouterDialog(
MediaRouterDialogOpenOrigin activation_location) { MediaRouterDialogOpenOrigin activation_location) {
// TODO(crbug.com/736568): Re-enable dialog in VR.
if (vr::VrTabHelper::IsUiSuppressedInVr(
initiator(),
vr::UiSuppressedElement::kMediaRouterPresentationRequest)) {
CancelPresentationRequest();
return;
}
JNIEnv* env = base::android::AttachCurrentThread(); JNIEnv* env = base::android::AttachCurrentThread();
std::vector<MediaSource> sources; std::vector<MediaSource> sources;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment