chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc - Issue 460183002: Removed --disable-device-discovery switch.

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 460183002: Removed --disable-device-discovery switch. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Mon 08/11/2014 18:23:33.89 Created 6 years, 4 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 b05d5fdd8f10ff0a174c654a724814a937724b44..2c8ec46a6271fc15bdb5b4eda2bbab7e9a2f7524 100644

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

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

@@ -277,9 +277,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,

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

return &NewWebUI<CrashesUI>;

#if defined(ENABLE_SERVICE_DISCOVERY)

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

- !CommandLine::ForCurrentProcess()->HasSwitch(

- switches::kDisableDeviceDiscovery)) {

+ if (url.host() == chrome::kChromeUIDevicesHost) {

return &NewWebUI<LocalDiscoveryUI>;

}

#endif