| Index: chrome/browser/ui/tab_helpers.cc
|
| diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
|
| index e98dac638265472d0abfb1fc1af1c180e7aeafe1..2f5b3f84f9e3561502ccd47c013d039984977b11 100644
|
| --- a/chrome/browser/ui/tab_helpers.cc
|
| +++ b/chrome/browser/ui/tab_helpers.cc
|
| @@ -57,6 +57,7 @@
|
| #include "chrome/browser/ui/search_engines/search_engine_tab_helper.h"
|
| #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
|
| #include "chrome/browser/ui/tab_dialogs.h"
|
| +#include "chrome/browser/vr/vr_tab_helper.h"
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/common/features.h"
|
| #include "components/autofill/content/browser/content_autofill_driver_factory.h"
|
| @@ -81,12 +82,6 @@
|
| #include "chrome/browser/android/offline_pages/recent_tab_helper.h"
|
| #include "chrome/browser/android/search_geolocation/search_geolocation_disclosure_tab_helper.h"
|
| #include "chrome/browser/android/voice_search_tab_helper.h"
|
| -
|
| -#include "device/vr/features/features.h" // nogncheck
|
| -#if BUILDFLAG(ENABLE_VR)
|
| -#include "chrome/browser/android/vr_shell/vr_tab_helper.h"
|
| -#endif // BUILDFLAG(ENABLE_VR)
|
| -
|
| #include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h"
|
| #include "chrome/browser/ui/android/context_menu_helper.h"
|
| #include "chrome/browser/ui/android/view_android_helper.h"
|
| @@ -228,6 +223,7 @@ void TabHelpers::AttachTabHelpers(
|
| // TODO(vabr): Remove TabSpecificContentSettings from here once their function
|
| // is taken over by ChromeContentSettingsClient. http://crbug.com/387075
|
| TabSpecificContentSettings::CreateForWebContents(web_contents);
|
| + vr::VrTabHelper::CreateForWebContents(web_contents);
|
|
|
| // NO! Do not just add your tab helper here. This is a large alphabetized
|
| // block; please insert your tab helper above in alphabetical order.
|
| @@ -246,11 +242,6 @@ void TabHelpers::AttachTabHelpers(
|
| SingleTabModeTabHelper::CreateForWebContents(web_contents);
|
| ViewAndroidHelper::CreateForWebContents(web_contents);
|
| VoiceSearchTabHelper::CreateForWebContents(web_contents);
|
| -
|
| -#if BUILDFLAG(ENABLE_VR)
|
| - vr_shell::VrTabHelper::CreateForWebContents(web_contents);
|
| -#endif
|
| -
|
| #else
|
| BookmarkTabHelper::CreateForWebContents(web_contents);
|
| extensions::ChromeExtensionWebContentsObserver::CreateForWebContents(
|
|
|