chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc - Issue 195983023: Enable devices page UI on MacOSX

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 195983023: Enable devices page UI on MacOSX (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fix_dcheck

Patch Set: Created 6 years, 9 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 f70bf0fa6339037241327488ed40a2c7cadb2d8b..63287451adae2555d28d7c7b18dbf3cdec4b4b89 100644

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

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

@@ -144,7 +144,7 @@

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

#endif

-#if defined(ENABLE_MDNS)

+#if defined(ENABLE_SERVICE_DISCOVERY)

#include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h"

#endif

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

return &NewWebUI<ConstrainedWebDialogUI>;

if (url.host() == chrome::kChromeUICrashesHost)

return &NewWebUI<CrashesUI>;

-#if defined(ENABLE_MDNS)

+#if defined(ENABLE_SERVICE_DISCOVERY)

if (url.host() == chrome::kChromeUIDevicesHost &&

!CommandLine::ForCurrentProcess()->HasSwitch(

switches::kDisableDeviceDiscovery)) {