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 <[email protected]>
Reviewed-by: Matthew Mourgos <[email protected]>
Commit-Queue: Manu Cornet <[email protected]>
Cr-Commit-Position: refs/heads/master@{#695849}
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
index b106ce2..4cb1032 100644
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -1809,16 +1809,12 @@
     "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.";