Add a enabled by default flag VmStatusPage for chrome://vm

(cherry picked from commit 5590306) Bug: b/173653141 Change-Id: I68c06aef7cb902cfd51cdd4a71373f5e223d71de Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2813518 Reviewed-by: calamity <calamity@chromium.org> Reviewed-by: Timothy Loh <timloh@chromium.org> Auto-Submit: Jason Lin <lxj@google.com> Commit-Queue: Timothy Loh <timloh@chromium.org> Commit-Queue: Jason Lin <lxj@google.com> Cr-Original-Commit-Position: refs/heads/master@{#871369} Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2823428 Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Commit-Queue: Kyle Horimoto <khorimoto@chromium.org> Reviewed-by: Kyle Horimoto <khorimoto@chromium.org> Cr-Commit-Position: refs/branch-heads/4472@{#37} Cr-Branched-From: 3d60439-refs/heads/master@{#870763}
chromium · Apr 13, 2021 · 4829987 · 4829987
1 parent b4a805c
commit 4829987
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 1 deletion.
diff --git a/ash/constants/ash_features.cc b/ash/constants/ash_features.cc
@@ -708,6 +708,10 @@ const base::Feature kVirtualKeyboardMultipaste{
 const base::Feature kVmCameraMicIndicatorsAndNotifications{
     "VmCameraMicIndicatorsAndNotifications", base::FEATURE_ENABLED_BY_DEFAULT};
 
+// Enable or disable the chrome://vm page
+const base::Feature kVmStatusPage{"VmStatusPage",
+                                  base::FEATURE_ENABLED_BY_DEFAULT};
+
 // Controls whether to allow enabling wake on WiFi features in shill.
 const base::Feature kWakeOnWifiAllowed{"WakeOnWifiAllowed",
                                        base::FEATURE_DISABLED_BY_DEFAULT};

diff --git a/ash/constants/ash_features.h b/ash/constants/ash_features.h
@@ -317,6 +317,8 @@ extern const base::Feature kVirtualKeyboardMultipaste;
 COMPONENT_EXPORT(ASH_CONSTANTS)
 extern const base::Feature kVmCameraMicIndicatorsAndNotifications;
 COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const base::Feature kVmStatusPage;
+COMPONENT_EXPORT(ASH_CONSTANTS)
 extern const base::Feature kWakeOnWifiAllowed;
 COMPONENT_EXPORT(ASH_CONSTANTS)
 extern const base::Feature kWallpaperWebUI;

diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
@@ -3356,6 +3356,9 @@ const FeatureEntry kFeatureEntries[] = {
      kOsCrOS,
      FEATURE_VALUE_TYPE(
          chromeos::features::kVmCameraMicIndicatorsAndNotifications)},
+    {"vm-status-page", flag_descriptions::kVmStatusPageName,
+     flag_descriptions::kVmStatusPageDescription, kOsCrOS,
+     FEATURE_VALUE_TYPE(chromeos::features::kVmStatusPage)},
     {"crostini-reset-lxd-db", flag_descriptions::kCrostiniResetLxdDbName,
      flag_descriptions::kCrostiniResetLxdDbDescription, kOsCrOS,
      FEATURE_VALUE_TYPE(chromeos::features::kCrostiniResetLxdDb)},

diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
@@ -5266,6 +5266,11 @@
     "owners": [ "lxj", "joelhockey", "timloh" ],
     "expiry_milestone": 93
   },
+  {
+    "name": "vm-status-page",
+    "owners": [ "lxj", "joelhockey", "timloh" ],
+    "expiry_milestone": 94
+  },
   {
     "name": "voice-button-in-top-toolbar",
     "owners": [ "jds", "chrome-language" ],

diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
@@ -4886,6 +4886,9 @@ const char kVmCameraMicIndicatorsAndNotificationsName[] =
 const char kVmCameraMicIndicatorsAndNotificationsDescription[] =
     "Show VM camera/mic indicators/notifications";
 
+const char kVmStatusPageName[] = "VM status page";
+const char kVmStatusPageDescription[] = "Enable VM status page";
+
 const char kWakeOnWifiAllowedName[] = "Allow enabling wake on WiFi features";
 const char kWakeOnWifiAllowedDescription[] =
     "Allows wake on WiFi features in shill to be enabled.";

diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
@@ -2841,6 +2841,9 @@ extern const char kVirtualKeyboardMultipasteDescription[];
 extern const char kVmCameraMicIndicatorsAndNotificationsName[];
 extern const char kVmCameraMicIndicatorsAndNotificationsDescription[];
 
+extern const char kVmStatusPageName[];
+extern const char kVmStatusPageDescription[];
+
 extern const char kWakeOnWifiAllowedName[];
 extern const char kWakeOnWifiAllowedDescription[];
 

diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -835,7 +835,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
       base::FeatureList::IsEnabled(chromeos::features::kEcheSWA)) {
     return &NewWebUI<chromeos::eche_app::EcheAppUI>;
   }
-  if (url.host_piece() == chrome::kChromeUIVmHost) {
+  if (url.host_piece() == chrome::kChromeUIVmHost &&
+      base::FeatureList::IsEnabled(chromeos::features::kVmStatusPage)) {
     return &NewWebUI<chromeos::VmUI>;
   }
   if (url.host_piece() == chromeos::kChromeUIPersonalizationAppHost &&

diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml
@@ -44395,6 +44395,7 @@ from previous Chrome versions.
   <int value="-1713564656" label="ProtectSyncCredentialOnReauth:enabled"/>
   <int value="-1711751318" label="enable-data-reduction-proxy-lo-fi-preview"/>
   <int value="-1710772665" label="disable-my-files-navigation"/>
+  <int value="-1706483123" label="VmStatusPage:enabled"/>
   <int value="-1704472714" label="UseMessagesGoogleComDomain:disabled"/>
   <int value="-1703709912" label="enable-new-ntp"/>
   <int value="-1703308540" label="disable-webaudio"/>
@@ -44407,6 +44408,7 @@ from previous Chrome versions.
   <int value="-1695774453" label="skip-extra-ash-window-positioning"/>
   <int value="-1694900665" label="HandwritingGestureEditing:enabled"/>
   <int value="-1693498375" label="CdmFactoryDaemon:enabled"/>
+  <int value="-1692973133" label="VmStatusPage:disabled"/>
   <int value="-1692967465"
       label="ContextMenuPerformanceInfoAndRemoteHintFetching:enabled"/>
   <int value="-1692384483" label="disambiguate-autofill-server-name-types"/>