Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(409)

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:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/prefs/browser_prefs.cc
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 1dc94cf3f08c1cdf9db08fb7190f1220053dfcf1..c0723d824ed578bb935bfd5aa229739a515c195c 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -116,7 +116,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
@@ -399,14 +399,14 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
ManagedUserSyncService::RegisterProfilePrefs(registry);
#endif
-#if defined(ENABLE_MDNS)
- LocalDiscoveryUI::RegisterProfilePrefs(registry);
-#endif
-
#if defined(ENABLE_NOTIFICATIONS)
DesktopNotificationService::RegisterProfilePrefs(registry);
#endif
+#if defined(ENABLE_SERVICE_DISCOVERY)
+ LocalDiscoveryUI::RegisterProfilePrefs(registry);
+#endif
+
#if defined(OS_ANDROID)
chrome_variations::VariationsService::RegisterProfilePrefs(registry);
NewTabPagePrefs::RegisterProfilePrefs(registry);

Powered by Google App Engine
This is Rietveld 408576698