Remove chrome://devices page
The page has been behind a flag that is disabled by default since M86.
By the M88 Stable release, cloud print will be turned down, so this page
for adding new cloud printers will no longer be needed.
Bug: 1112576
Change-Id: Ibc12a7180c268f5c91153d5c44ae615779b0f88c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2516245
Commit-Queue: Rebekah Potter <[email protected]>
Reviewed-by: Gabriel Charette <[email protected]>
Reviewed-by: Julian Pastarmov <[email protected]>
Reviewed-by: Daniel Hosseinian <[email protected]>
Reviewed-by: dpapad <[email protected]>
Cr-Commit-Position: refs/heads/master@{#826134}
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index c30beb6f..dbbbade9 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -197,10 +197,6 @@
#include "chrome/browser/renderer_host/pepper/device_id_fetcher.h"
#endif
-#if BUILDFLAG(ENABLE_SERVICE_DISCOVERY)
-#include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h"
-#endif
-
#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
#include "chrome/browser/supervised_user/child_accounts/child_account_service.h"
#include "chrome/browser/supervised_user/supervised_user_allowlist_service.h"
@@ -559,6 +555,12 @@
#if defined(USE_X11)
registry->RegisterIntegerPref(kMigrationToLoginDBStep, 0);
#endif
+
+#if BUILDFLAG(ENABLE_SERVICE_DISCOVERY)
+ registry->RegisterBooleanPref(prefs::kLocalDiscoveryEnabled, true);
+ registry->RegisterBooleanPref(prefs::kLocalDiscoveryNotificationsEnabled,
+ false);
+#endif
}
} // namespace
@@ -867,10 +869,6 @@
ChromeRLZTrackerDelegate::RegisterProfilePrefs(registry);
#endif
-#if BUILDFLAG(ENABLE_SERVICE_DISCOVERY)
- LocalDiscoveryUI::RegisterProfilePrefs(registry);
-#endif
-
#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
ChildAccountService::RegisterProfilePrefs(registry);
SupervisedUserService::RegisterProfilePrefs(registry);
@@ -1153,4 +1151,10 @@
#if defined(USE_X11)
profile_prefs->ClearPref(kMigrationToLoginDBStep);
#endif
+
+ // Added 11/2020.
+#if BUILDFLAG(ENABLE_SERVICE_DISCOVERY)
+ profile_prefs->ClearPref(prefs::kLocalDiscoveryEnabled);
+ profile_prefs->ClearPref(prefs::kLocalDiscoveryNotificationsEnabled);
+#endif
}
