[go: nahoru, domu]

[Phone Hub][Eche] Cleanup usage of Jelly flag

Flag cleanup now that Jelly has launched.

After Video:
https://drive.google.com/file/d/1_thOHsLSrs_lrsUf_lx9bEuwyq9Gj_ms/view?usp=sharing&resourcekey=0-P7ey3MuGEqFPClOahDcOhg

Test: Manually verified no UI regressions, video provided.
Bug: b/281844561, b/322067753
Fixed: b/297056011
Change-Id: I67204757b0a9f0ff060874b039142bfdfe40092f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5246745
Reviewed-by: Jon Mann <jonmann@chromium.org>
Reviewed-by: Pu Shi <pushi@google.com>
Commit-Queue: Crisrael Lucero <crisrael@google.com>
Cr-Commit-Position: refs/heads/main@{#1253515}
diff --git a/ash/system/phonehub/task_continuation_view.cc b/ash/system/phonehub/task_continuation_view.cc
index 8984d6f..554a0779 100644
--- a/ash/system/phonehub/task_continuation_view.cc
+++ b/ash/system/phonehub/task_continuation_view.cc
@@ -11,7 +11,6 @@
 #include "ash/system/phonehub/phone_hub_view_ids.h"
 #include "ash/system/phonehub/ui_constants.h"
 #include "ash/system/tray/tray_constants.h"
-#include "chromeos/constants/chromeos_features.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/metadata/metadata_header_macros.h"
 #include "ui/base/metadata/metadata_impl_macros.h"
@@ -32,9 +31,6 @@
 constexpr int kTaskContinuationChipVerticalPadding = 4;
 constexpr int kHeaderLabelLineHeight = 48;
 
-// Typography.
-constexpr int kHeaderTextFontSizeDip = 15;
-
 gfx::Size GetTaskContinuationChipSize() {
   int width =
       (kTrayMenuWidth - kBubbleHorizontalSidePaddingDip * 2 -
@@ -55,18 +51,12 @@
     SetVerticalAlignment(gfx::VerticalAlignment::ALIGN_MIDDLE);
     SetAutoColorReadabilityEnabled(false);
     SetSubpixelRenderingEnabled(false);
+    // TODO(b/322067753): Replace usage of |AshColorProvider| with
+    // |cros_tokens|.
     SetEnabledColor(AshColorProvider::Get()->GetContentLayerColor(
         AshColorProvider::ContentLayerType::kTextColorPrimary));
-
-    if (chromeos::features::IsJellyrollEnabled()) {
-      TypographyProvider::Get()->StyleLabel(ash::TypographyToken::kCrosButton1,
-                                            *this);
-    } else {
-      SetFontList(font_list()
-                      .DeriveWithSizeDelta(kHeaderTextFontSizeDip -
-                                           font_list().GetFontSize())
-                      .DeriveWithWeight(gfx::Font::Weight::MEDIUM));
-    }
+    TypographyProvider::Get()->StyleLabel(ash::TypographyToken::kCrosButton1,
+                                          *this);
     SetLineHeight(kHeaderLabelLineHeight);
   }