| Index: chrome/browser/ui/browser.cc
|
| diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
|
| index c06816875c13682a81b74bcc21eba64aedf5d78b..1cca974532d1999bd602e6748c52a3e6d71f7f23 100644
|
| --- a/chrome/browser/ui/browser.cc
|
| +++ b/chrome/browser/ui/browser.cc
|
| @@ -146,6 +146,7 @@
|
| #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
|
| #include "chrome/browser/ui/window_sizer/window_sizer.h"
|
| #include "chrome/browser/upgrade_detector.h"
|
| +#include "chrome/browser/vr/vr_tab_helper.h"
|
| #include "chrome/common/chrome_constants.h"
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/common/custom_handlers/protocol_handler.h"
|
| @@ -194,6 +195,7 @@
|
| #include "content/public/common/page_zoom.h"
|
| #include "content/public/common/renderer_preferences.h"
|
| #include "content/public/common/webplugininfo.h"
|
| +#include "device/vr/features/features.h"
|
| #include "extensions/browser/extension_prefs.h"
|
| #include "extensions/browser/extension_registry.h"
|
| #include "extensions/browser/extension_system.h"
|
| @@ -1787,6 +1789,9 @@ void Browser::RegisterProtocolHandler(WebContents* web_contents,
|
| if (context->IsOffTheRecord())
|
| return;
|
|
|
| + if (vr::VrTabHelper::IsInVr(web_contents))
|
| + return;
|
| +
|
| ProtocolHandler handler =
|
| ProtocolHandler::CreateProtocolHandler(protocol, url);
|
|
|
|
|