chrome/browser/prefs/browser_prefs.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/prefs/browser_prefs.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/prefs/browser_prefs.cc

diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc

index d100644d07eca684f747fc17704cd4f8f95e6efb..11b81d19848a7f179b654189e0e3ed67febc4173 100644

--- a/chrome/browser/prefs/browser_prefs.cc

+++ b/chrome/browser/prefs/browser_prefs.cc

@@ -115,7 +115,7 @@

#include "chrome/browser/managed_mode/managed_user_sync_service.h"

#endif

-#if defined(ENABLE_MDNS)

+#if defined(ENABLE_SERVICE_DISCOVERY)

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

#endif

@@ -397,7 +397,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {

ManagedUserSyncService::RegisterProfilePrefs(registry);

#endif

-#if defined(ENABLE_MDNS)

+#if defined(ENABLE_SERVICE_DISCOVERY)

Bernhard Bauer 2014/03/20 09:03:14 Can you move this to after ENABLE_NOTIFICATIONS, s

Noam Samuel 2014/03/20 16:50:58 Done.

LocalDiscoveryUI::RegisterProfilePrefs(registry);

#endif