Chromium Code Reviews| Index: chrome/browser/ui/tab_helpers.cc |
| diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc |
| index a70d9b267a6c77c6f5809e67b6f51e800f5c6fe9..59870f9b41235cdfc3a1a4b321ff7fadb2a8d93d 100644 |
| --- a/chrome/browser/ui/tab_helpers.cc |
| +++ b/chrome/browser/ui/tab_helpers.cc |
| @@ -77,6 +77,12 @@ |
| #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" |
|
Ted C
2017/05/11 18:32:23
why this include? why not in the ifdef if needed?
Ian Vollick
2017/05/11 19:30:10
IIUC, it's needed for the following ifdef to work
|
| +#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" |
| @@ -230,6 +236,11 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { |
| 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( |