cros: Convert switch to Feature for KSV

This cl converts the Keyboard Shortcut Viewer (KSV) switch to a
base::Feature which is enabled by default.

[email protected]

Bug: 768932, 778874
Test: the feature works properly
Change-Id: I38517d3084f2f493c822d3c435101525d2c98839
Reviewed-on: https://chromium-review.googlesource.com/946550
Reviewed-by: Mitsuru Oshima <[email protected]>
Commit-Queue: Tao Wu <[email protected]>
Cr-Original-Commit-Position: refs/heads/master@{#540584}(cherry picked from commit 40de263)
Reviewed-on: https://chromium-review.googlesource.com/952169
Reviewed-by: Tao Wu <[email protected]>
Cr-Commit-Position: refs/branch-heads/3359@{#56}
Cr-Branched-From: 66afc5e-refs/heads/master@{#540276}

Author: wutao

ash/public/cpp/ash_features.cc

@@ -10,13 +10,20 @@ namespace features {
 const base::Feature kDockedMagnifier{"DockedMagnifier",
                                      base::FEATURE_ENABLED_BY_DEFAULT};
 
+const base::Feature kKeyboardShortcutViewer{"KeyboardShortcutViewer",
+                                            base::FEATURE_ENABLED_BY_DEFAULT};
+
 const base::Feature kSystemTrayUnified{"SystemTrayUnified",
                                        base::FEATURE_DISABLED_BY_DEFAULT};
 
 bool IsDockedMagnifierEnabled() {
   return base::FeatureList::IsEnabled(kDockedMagnifier);
 }
 
+bool IsKeyboardShortcutViewerEnabled() {
+  return base::FeatureList::IsEnabled(kKeyboardShortcutViewer);
+}
+
 bool IsSystemTrayUnifiedEnabled() {
   return base::FeatureList::IsEnabled(kSystemTrayUnified);
 }

ash/public/cpp/ash_features.h

@@ -16,11 +16,18 @@ namespace features {
 // https://crbug.com/709824.
 ASH_PUBLIC_EXPORT extern const base::Feature kDockedMagnifier;
 
+// Enables the keyboard shortcut viewer.
+// TODO(wutao): Remove this after the feature is fully launched.
+// https://crbug.com/755448.
+ASH_PUBLIC_EXPORT extern const base::Feature kKeyboardShortcutViewer;
+
 // Enables new system menu.
 ASH_PUBLIC_EXPORT extern const base::Feature kSystemTrayUnified;
 
 ASH_PUBLIC_EXPORT bool IsDockedMagnifierEnabled();
 
+ASH_PUBLIC_EXPORT bool IsKeyboardShortcutViewerEnabled();
+
 ASH_PUBLIC_EXPORT bool IsSystemTrayUnifiedEnabled();
 
 }  // namespace features

ash/public/cpp/ash_switches.cc

@@ -52,11 +52,6 @@ const char kAshEnableV1AppBackButton[] = "ash-enable-v1-app-back-button";
 const char kAshEnableDisplayMoveWindowAccels[] =
     "ash-enable-display-move-window-accels";
 
-// Enables keyboard shortcut viewer.
-// TODO(wutao): Remove this once the feature is launched. crbug.com/768932.
-const char kAshEnableKeyboardShortcutViewer[] =
-    "ash-enable-keyboard-shortcut-viewer";
-
 // Enables key bindings to scroll magnified screen.
 const char kAshEnableMagnifierKeyScroller[] =
     "ash-enable-magnifier-key-scroller";

ash/public/cpp/ash_switches.h

@@ -27,7 +27,6 @@ ASH_PUBLIC_EXPORT extern const char kAshDisableTrilinearFiltering[];
 ASH_PUBLIC_EXPORT extern const char kAshDisableTouchExplorationMode[];
 ASH_PUBLIC_EXPORT extern const char kAshEnableV1AppBackButton[];
 ASH_PUBLIC_EXPORT extern const char kAshEnableDisplayMoveWindowAccels[];
-ASH_PUBLIC_EXPORT extern const char kAshEnableKeyboardShortcutViewer[];
 ASH_PUBLIC_EXPORT extern const char kAshEnableMagnifierKeyScroller[];
 ASH_PUBLIC_EXPORT extern const char kAshEnableNewOverviewAnimations[];
 ASH_PUBLIC_EXPORT extern const char kAshEnableNewOverviewUi[];

chrome/browser/about_flags.cc

@@ -3430,8 +3430,7 @@ const FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kEnableManualFallbacksFillingName,
      flag_descriptions::kEnableManualFallbacksFillingDescription,
      kOsDesktop | kOsAndroid,
-     FEATURE_VALUE_TYPE(
-         password_manager::features::kManualFallbacksFilling)},
+     FEATURE_VALUE_TYPE(password_manager::features::kManualFallbacksFilling)},
 
 #if !defined(OS_ANDROID)
     {"voice-search-on-local-ntp", flag_descriptions::kVoiceSearchOnLocalNtpName,
@@ -3619,7 +3618,7 @@ const FeatureEntry kFeatureEntries[] = {
     {"ash-enable-keyboard-shortcut-viewer",
      flag_descriptions::kAshEnableKeyboardShortcutViewerName,
      flag_descriptions::kAshEnableKeyboardShortcutViewerDescription, kOsCrOS,
-     SINGLE_VALUE_TYPE(ash::switches::kAshEnableKeyboardShortcutViewer)},
+     FEATURE_VALUE_TYPE(ash::features::kKeyboardShortcutViewer)},
 
     {"ash-disable-login-dim-and-blur",
      flag_descriptions::kAshDisableLoginDimAndBlurName,

chrome/browser/ui/ash/chrome_new_window_client.cc

@@ -5,7 +5,7 @@
 #include "chrome/browser/ui/ash/chrome_new_window_client.h"
 
 #include "ash/content/keyboard_overlay/keyboard_overlay_view.h"
-#include "ash/public/cpp/ash_switches.h"
+#include "ash/public/cpp/ash_features.h"
 #include "ash/public/interfaces/constants.mojom.h"
 #include "base/macros.h"
 #include "chrome/browser/chromeos/file_manager/app_id.h"
@@ -216,10 +216,8 @@ void ChromeNewWindowClient::RestoreTab() {
 
 // TODO(crbug.com/755448): Remove this when the new shortcut viewer is enabled.
 void ChromeNewWindowClient::ShowKeyboardOverlay() {
-  // TODO(wutao): It is only for cl reviewers to test the new shortcut viewer
-  // and will be removed when the new shortcut viewer is enabled.
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          ash::switches::kAshEnableKeyboardShortcutViewer)) {
+  // Show the new keyboard shortcut viewer if the feature is enabled.
+  if (ash::features::IsKeyboardShortcutViewerEnabled()) {
     keyboard_shortcut_viewer_util::ShowKeyboardShortcutViewer();
     return;
   }

tools/metrics/histograms/enums.xml

@@ -25849,6 +25849,7 @@ from previous Chrome versions.
   <int value="-1469536698" label="ChromeHomeDoodle:enabled"/>
   <int value="-1469228683" label="QuickUnlockPinSignin:disabled"/>
   <int value="-1468126425" label="ResourceLoadScheduler:disabled"/>
+  <int value="-1467642274" label="KeyboardShortcutViewer:disabled"/>
   <int value="-1467332609" label="tab-management-experiment-type-anise"/>
   <int value="-1466990325" label="CrosCompUpdates:enabled"/>
   <int value="-1466759286" label="TabModalJsDialog:disabled"/>
@@ -26156,7 +26157,6 @@ from previous Chrome versions.
   <int value="-723224470" label="enable-password-force-saving:enabled"/>
   <int value="-722474177" label="browser-side-navigation:disabled"/>
   <int value="-718626298" label="SysInternals:enabled"/>
-  <int value="-717281513" label="ash-enable-keyboard-shortcut-viewer"/>
   <int value="-716953514" label="disable-password-separated-signin-flow"/>
   <int value="-715733307" label="force-effective-connection-type"/>
   <int value="-714712077" label="ClickToOpenPDFPlaceholder:disabled"/>
@@ -26169,6 +26169,7 @@ from previous Chrome versions.
   <int value="-704232562" label="UseMonitorColorSpace:enabled"/>
   <int value="-702477233" label="ContentFullscreen:enabled"/>
   <int value="-699767107" label="enable-sync-app-list"/>
+  <int value="-699198009" label="KeyboardShortcutViewer:enabled"/>
   <int value="-697751423" label="disable-quickoffice-component-app"/>
   <int value="-684900739" label="disable-merge-key-char-events"/>
   <int value="-684223908" label="enable-android-wallpapers-app"/>