Remove TerminalSSH flag and cleanup references to Terminal app
Terminal app is no longer a crostini app, it is a web app. Previous
special-casing for terminal as a crostini app can be removed.
Bug: 1028898
Change-Id: I794a6b6c08ef0d50ecbf40d8a4c438b2702f3121
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3646546
Reviewed-by: Timothy Loh <[email protected]>
Reviewed-by: Lei Zhang <[email protected]>
Reviewed-by: Anqing Zhao <[email protected]>
Commit-Queue: Joel Hockey <[email protected]>
Reviewed-by: Nancy Wang <[email protected]>
Reviewed-by: Jason Lin <[email protected]>
Reviewed-by: Xiyuan Xia <[email protected]>
Reviewed-by: Jeffrey Young <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1005140}
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 42a9df7d..1c8b563 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -319,6 +319,7 @@
#include "chrome/browser/ash/crosapi/browser_util.h"
#include "chrome/browser/ash/crosapi/network_settings_service_ash.h"
#include "chrome/browser/ash/crostini/crostini_pref_names.h"
+#include "chrome/browser/ash/crostini/crostini_terminal.h"
#include "chrome/browser/ash/crostini/crostini_util.h"
#include "chrome/browser/ash/cryptauth/client_app_metadata_provider_service.h"
#include "chrome/browser/ash/cryptauth/cryptauth_device_id_provider_impl.h"
@@ -1886,6 +1887,12 @@
profile_prefs->ClearPref(kAccessCodeCastDiscoveredNetworks);
#endif // !BUILDFLAG(IS_ANDROID)
+#if BUILDFLAG(IS_CHROMEOS_ASH)
+ // Added 05/2022.
+ // TODO(crbug.com/1028898): Remove after M110.
+ crostini::RemoveTerminalFromRegistry(profile_prefs);
+#endif
+
// Please don't delete the following line. It is used by PRESUBMIT.py.
// END_MIGRATE_OBSOLETE_PROFILE_PREFS
