diff --git a/ash/public/cpp/ash_switches.cc b/ash/public/cpp/ash_switches.cc index 1d5d83e8..9e1c256 100644 --- a/ash/public/cpp/ash_switches.cc +++ b/ash/public/cpp/ash_switches.cc
@@ -24,6 +24,10 @@ const char kAshDisableShelfModelSynchronization[] = "ash-disable-shelf-model-synchronization"; +// Disables a smoother animation for screen rotation. +const char kAshDisableSmoothScreenRotation[] = + "ash-disable-smooth-screen-rotation"; + // Disables autohide titlebars feature. With this flag disabled, apps in tablet // mode will have visible titlebars instead of autohidden titlebars. // TODO(crbug.com/764393): Remove this flag in M66/M67. @@ -40,6 +44,11 @@ // TODO(oshima): Remove this once the feature is launched. crbug.com/749713. const char kAshEnableV1AppBackButton[] = "ash-enable-v1-app-back-button"; +// 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"; @@ -69,10 +78,6 @@ // to modify the dsf of the device to any non discrete value. const char kAshEnableScaleSettingsTray[] = "ash-enable-scale-settings-tray"; -// Disables a smoother animation for screen rotation. -const char kAshDisableSmoothScreenRotation[] = - "ash-disable-smooth-screen-rotation"; - // Specifies the estimated time (in milliseconds) from VSYNC event until when // visible light can be noticed by the user. const char kAshEstimatedPresentationDelay[] =
diff --git a/ash/public/cpp/ash_switches.h b/ash/public/cpp/ash_switches.h index a98c305..78542bc2 100644 --- a/ash/public/cpp/ash_switches.h +++ b/ash/public/cpp/ash_switches.h
@@ -24,6 +24,7 @@ ASH_PUBLIC_EXPORT extern const char kAshDisableTabletAutohideTitlebars[]; ASH_PUBLIC_EXPORT extern const char kAshDisableTouchExplorationMode[]; ASH_PUBLIC_EXPORT extern const char kAshEnableV1AppBackButton[]; +ASH_PUBLIC_EXPORT extern const char kAshEnableKeyboardShortcutViewer[]; ASH_PUBLIC_EXPORT extern const char kAshEnableMagnifierKeyScroller[]; ASH_PUBLIC_EXPORT extern const char kAshEnableNightLight[]; ASH_PUBLIC_EXPORT extern const char kAshEnablePaletteOnAllDisplays[];
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index ac8d365f..57dfcf16 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc
@@ -3607,6 +3607,13 @@ FEATURE_VALUE_TYPE(kExperimentalTabControllerFeature)}, #endif // defined(OS_WIN) +#if defined(OS_CHROMEOS) + {"ash-enable-keyboard-shortcut-viewer", + flag_descriptions::kAshEnableKeyboardShortcutViewerName, + flag_descriptions::kAshEnableKeyboardShortcutViewerDescription, kOsCrOS, + SINGLE_VALUE_TYPE(ash::switches::kAshEnableKeyboardShortcutViewer)}, +#endif // OS_CHROMEOS + // NOTE: Adding a new flag requires adding a corresponding entry to enum // "LoginCustomFlags" in tools/metrics/histograms/enums.xml. See "Flag // Histograms" in tools/metrics/histograms/README.md (run the
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc index d9112d1f..054151b 100644 --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc
@@ -2803,6 +2803,11 @@ const char kAshDisableSmoothScreenRotationDescription[] = "Disable smooth rotation animations."; +const char kAshEnableKeyboardShortcutViewerName[] = + "Enable keyboard shortcut viewer."; +const char kAshEnableKeyboardShortcutViewerDescription[] = + "Enable keyboard shortcut viewer."; + const char kAshEnableMirroredScreenName[] = "Enable mirrored screen mode."; const char kAshEnableMirroredScreenDescription[] = "Enable the mirrored screen mode. This mode flips the screen image "
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h index 80a08f6..f998400 100644 --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h
@@ -1729,6 +1729,9 @@ extern const char kAshDisableSmoothScreenRotationName[]; extern const char kAshDisableSmoothScreenRotationDescription[]; +extern const char kAshEnableKeyboardShortcutViewerName[]; +extern const char kAshEnableKeyboardShortcutViewerDescription[]; + extern const char kAshEnableMirroredScreenName[]; extern const char kAshEnableMirroredScreenDescription[];
diff --git a/third_party/WebKit/LayoutTests/TestExpectations b/third_party/WebKit/LayoutTests/TestExpectations index a33d7d0..4cec27c 100644 --- a/third_party/WebKit/LayoutTests/TestExpectations +++ b/third_party/WebKit/LayoutTests/TestExpectations
@@ -2673,6 +2673,8 @@ crbug.com/736333 [ Win7 Linux ] plugins/iframe-plugin-bgcolor.html [ Failure Pass ] crbug.com/742670 [ Mac ] plugins/iframe-plugin-bgcolor.html [ Failure Pass ] +crbug.com/780398 [ Mac ] plugins/mouse-capture-inside-shadow.html [ Failure Pass ] + crbug.com/678346 [ Debug ] fast/dom/shadow/selections-in-shadow.html [ Pass Timeout ] crbug.com/678346 [ Win7 Mac Debug ] storage/indexeddb/index-cursor.html [ Pass Timeout ] crbug.com/678346 [ Win7 Debug ] storage/indexeddb/mozilla/test_objectStore_openKeyCursor.html [ Pass Timeout ]
diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml index 91751e4..f7becbbe 100644 --- a/tools/metrics/histograms/enums.xml +++ b/tools/metrics/histograms/enums.xml
@@ -24493,6 +24493,7 @@ <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"/>