chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc - Issue 2680723003: Remove ENABLE_VR_SHELL compile-time define.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

Issue 2680723003: Remove ENABLE_VR_SHELL compile-time define. (Closed)

Patch Set: Fix lint warnings generated by vr_shell's new pickier checks. Created 3 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

index a5a7b81fe5f9ed71b91662ad0f3fd0fe56362689..0c54ad02caf62cd7e99b060283bcaae544da2e5f 100644

--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

@@ -116,7 +116,7 @@

#include "chrome/browser/ui/webui/popular_sites_internals_ui.h"

#include "chrome/browser/ui/webui/snippets_internals_ui.h"

#include "chrome/browser/ui/webui/webapks_ui.h"

-#if defined(ENABLE_VR_SHELL) || defined(ENABLE_WEBVR)

+#if defined(ENABLE_WEBVR)

#include "chrome/browser/ui/webui/vr_shell/vr_shell_ui_ui.h"

#endif

#else

@@ -522,7 +522,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,

return &NewWebUI<SnippetsInternalsUI>;

if (url.host_piece() == chrome::kChromeUIWebApksHost)

return &NewWebUI<WebApksUI>;

-#if defined(ENABLE_VR_SHELL) || defined(ENABLE_WEBVR)

+#if defined(ENABLE_WEBVR)

if (url.host_piece() == chrome::kChromeUIVrShellUIHost)

return &NewWebUI<VrShellUIUI>;

#endif

« no previous file with comments | « chrome/browser/ui/BUILD.gn ('k') | chrome/common/BUILD.gn » ('j') | no next file with comments »