CrOS Shelf: Fold the 'dense shelf' flag into 'hotseat'

The original plan was to potentially enable the denser shelf early, as
a first step, but it looks like it will now be enabled with the rest
of the shelf redesign.

There is now no need for the extra complexity of a separate flag for
the "densification".

Bug: 973483, 973482
Change-Id: I65d491818cecba93962823eb93c7c62f749f779f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1799385
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Matthew Mourgos <mmourgos@chromium.org>
Commit-Queue: Manu Cornet <manucornet@chromium.org>
Cr-Commit-Position: refs/heads/master@{#695849}

ash/public/cpp/app_list/app_list_config.cc

@@ -287,8 +287,7 @@ AppListConfig::AppListConfig(ash::AppListConfigType type)
       grid_tile_spacing_in_folder_(8),
       // TODO(manucornet): Share the value with ShelfConstants and use
       // 48 when the new shelf UI is turned off.
-      shelf_height_(chromeos::switches::ShouldShowShelfDenseClamshell() ? 48
-                                                                        : 56),
+      shelf_height_(chromeos::switches::ShouldShowShelfHotseat() ? 48 : 56),
       background_radius_(shelf_height_ / 2),
       blur_radius_(30),
       contents_background_color_(SkColorSetRGB(0xF2, 0xF2, 0xF2)),

ash/shelf/login_shelf_view.cc

@@ -120,11 +120,11 @@ std::unique_ptr<SkPath> GetButtonHighlightPath(views::View* view) {
   auto path = std::make_unique<SkPath>();
 
   gfx::Rect rect(view->GetLocalBounds());
-  rect.Inset(chromeos::switches::ShouldShowShelfDenseClamshell()
+  rect.Inset(chromeos::switches::ShouldShowShelfHotseat()
                  ? kButtonBackgroundMarginDense
                  : kButtonBackgroundMargin);
 
-  int border_radius = chromeos::switches::ShouldShowShelfDenseClamshell()
+  int border_radius = chromeos::switches::ShouldShowShelfHotseat()
                           ? kButtonRoundedBorderRadiusDpDense
                           : kButtonRoundedBorderRadiusDp;
   path->addRoundRect(gfx::RectToSkRect(rect), border_radius, border_radius);
@@ -183,10 +183,10 @@ class LoginShelfButton : public views::LabelButton {
 
   // views::LabelButton:
   gfx::Insets GetInsets() const override {
-    int top_margin = chromeos::switches::ShouldShowShelfDenseClamshell()
+    int top_margin = chromeos::switches::ShouldShowShelfHotseat()
                          ? kButtonMarginTopDpDense
                          : kButtonMarginTopDp;
-    int bottom_margin = chromeos::switches::ShouldShowShelfDenseClamshell()
+    int bottom_margin = chromeos::switches::ShouldShowShelfHotseat()
                             ? kButtonMarginBottomDpDense
                             : kButtonMarginBottomDp;
     return gfx::Insets(top_margin, kButtonMarginLeftDp, bottom_margin,

ash/shelf/shelf_config.cc

@@ -11,7 +11,7 @@
 namespace ash {
 
 ShelfConfig::ShelfConfig()
-    : is_dense_(chromeos::switches::ShouldShowShelfDenseClamshell()),
+    : is_dense_(chromeos::switches::ShouldShowShelfHotseat()),
       shelf_size_(56),
       shelf_size_dense_(48),
       shelf_button_icon_size_(44),

ash/system/status_area_widget_delegate.cc

@@ -206,7 +206,7 @@ void StatusAreaWidgetDelegate::SetBorderOnChild(views::View* child,
 
   // TODO: ensure that this is set in tablet mode, only when dense shelf
   // threshold is met. (just make this variable a member of ShelfConfig)
-  if (is_child_on_edge && chromeos::switches::ShouldShowShelfDenseClamshell())
+  if (is_child_on_edge && chromeos::switches::ShouldShowShelfHotseat())
     right_edge = kPaddingBetweenWidgetAndRightScreenEdge;
 
   // Swap edges if alignment is not horizontal (bottom-to-top).

ash/system/tray/tray_constants.h

@@ -184,14 +184,14 @@ constexpr int kUnifiedDetailedViewTitleRowHeight = 64;
 class TrayConstants {
  public:
   static int hit_region_padding() {
-    return UseNewDenseShelfUi() ? kHitRegionPaddingDense : kHitRegionPadding;
+    return UseNewHotseatShelfUi() ? kHitRegionPaddingDense : kHitRegionPadding;
   }
 
  private:
-  static bool UseNewDenseShelfUi() {
-    static bool use_new_dense_shelf_ui =
-        chromeos::switches::ShouldShowShelfDenseClamshell();
-    return use_new_dense_shelf_ui;
+  static bool UseNewHotseatShelfUi() {
+    static bool use_new_hotseat_shelf_ui =
+        chromeos::switches::ShouldShowShelfHotseat();
+    return use_new_hotseat_shelf_ui;
   }
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(TrayConstants);

chrome/browser/about_flags.cc

@@ -1692,9 +1692,6 @@ const FeatureEntry kFeatureEntries[] = {
     {"newblue", flag_descriptions::kNewblueName,
      flag_descriptions::kNewblueDescription, kOsCrOS,
      FEATURE_VALUE_TYPE(device::kNewblueDaemon)},
-    {"shelf-dense-clamshell", flag_descriptions::kShelfDenseClamshellName,
-     flag_descriptions::kShelfDenseClamshellDescription, kOsCrOS,
-     SINGLE_VALUE_TYPE(chromeos::switches::kShelfDenseClamshell)},
     {"shelf-hotseat", flag_descriptions::kShelfHotseatName,
      flag_descriptions::kShelfHotseatDescription, kOsCrOS,
      SINGLE_VALUE_TYPE(chromeos::switches::kShelfHotseat)},

chrome/browser/flag-metadata.json

@@ -2932,14 +2932,9 @@
     "owners": [ "//chrome/browser/sharing/OWNERS" ],
     "expiry_milestone": 80
   },
-  {
-    "name": "shelf-dense-clamshell",
-    "owners": [ "manucornet", "mmourgos" ],
-    "expiry_milestone": 82
-  },
   {
     "name": "shelf-hotseat",
-    "owners": [ "manucornet", "newcomer" ],
+    "owners": [ "manucornet", "mmourgos", "newcomer" ],
     "expiry_milestone": 82
   },
   {

chrome/browser/flag_descriptions.cc

@@ -1809,16 +1809,12 @@ const char kSharingUseDeviceInfoDescription[] =
     "Enables Sharing infrastructure to register devices in DeviceInfo and "
     "remove sync requirement.";
 
-const char kShelfDenseClamshellName[] =
-    "Show a smaller, denser shelf in laptop mode.";
-const char kShelfDenseClamshellDescription[] =
-    "Reduces the size of the shelf and its apps when in laptop mode.";
-
 const char kShelfHotseatName[] = "Enable a modular design for the shelf.";
 const char kShelfHotseatDescription[] =
     "Shows a modular design for the shelf where the apps are shown separately "
     "in a 'hotseat' interface when in tablet mode, and where various pieces "
-    "are separate and behave independently.";
+    "are separate and behave independently. Also reduces the size of the"
+    "shelf and its app when in laptop mode.";
 
 const char kShelfHoverPreviewsName[] =
     "Show previews of running apps when hovering over the shelf.";

chrome/browser/flag_descriptions.h

@@ -1070,9 +1070,6 @@ extern const char kSharingDeviceRegistrationDescription[];
 extern const char kSharingUseDeviceInfoName[];
 extern const char kSharingUseDeviceInfoDescription[];
 
-extern const char kShelfDenseClamshellName[];
-extern const char kShelfDenseClamshellDescription[];
-
 extern const char kShelfHotseatName[];
 extern const char kShelfHotseatDescription[];
 

chromeos/constants/chromeos_switches.cc

@@ -447,10 +447,8 @@ const char kRlzPingDelay[] = "rlz-ping-delay";
 // TODO(941489): Remove when the bug is fixed.
 const char kSamlPasswordChangeUrl[] = "saml-password-change-url";
 
-// Smaller, denser shelf in clamshell mode.
-const char kShelfDenseClamshell[] = "shelf-dense-clamshell";
-
-// New modular design for the shelf with apps separated into a hotseat UI.
+// New modular design for the shelf with apps separated into a hotseat UI and
+// smaller shelf in clamshell mode.
 const char kShelfHotseat[] = "shelf-hotseat";
 
 // App window previews when hovering over the shelf.
@@ -547,11 +545,6 @@ bool IsSigninFrameClientCertUserSelectionEnabled() {
       kDisableSigninFrameClientCertUserSelection);
 }
 
-bool ShouldShowShelfDenseClamshell() {
-  return base::CommandLine::ForCurrentProcess()->HasSwitch(
-      kShelfDenseClamshell);
-}
-
 bool ShouldShowShelfHotseat() {
   return base::CommandLine::ForCurrentProcess()->HasSwitch(kShelfHotseat);
 }

chromeos/constants/chromeos_switches.h

@@ -180,7 +180,6 @@ extern const char kRedirectLibassistantLogging[];
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS) extern const char kRegulatoryLabelDir[];
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS) extern const char kRlzPingDelay[];
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS) extern const char kSamlPasswordChangeUrl[];
-COMPONENT_EXPORT(CHROMEOS_CONSTANTS) extern const char kShelfDenseClamshell[];
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS) extern const char kShelfHoverPreviews[];
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS) extern const char kShelfHotseat[];
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS) extern const char kShelfScrollable[];
@@ -223,10 +222,8 @@ COMPONENT_EXPORT(CHROMEOS_CONSTANTS) bool IsSigninFrameClientCertsEnabled();
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS)
 bool IsSigninFrameClientCertUserSelectionEnabled();
 
-// Returns true if we should show a smaller, denser shelf in clamshell mode.
-COMPONENT_EXPORT(CHROMEOS_CONSTANTS) bool ShouldShowShelfDenseClamshell();
-
-// Returns true if we should show the modular shelf with the hotseat UI.
+// Returns true if we should show the modular shelf with the hotseat UI and
+// a smaller shelf in clamshell mode.
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS) bool ShouldShowShelfHotseat();
 
 // Returns true if we should show window previews when hovering over an app