Add typography style STYLE_EMPHASIZED_SECONDARY.

Uses this + STYLE_SECONDARY for the SettingsResetPromptDialog to match
the desired secondary style. Without STYLE_EMPHASIZED_SECONDARY the
emphasized text would be bold black which sticks out way too much
against the secondary gray.

Bug: chromium:698785
Change-Id: I3f9d1d3423ff3e990cc67f131f33ff0c7ddf55ff
Reviewed-on: https://chromium-review.googlesource.com/974065Reviewed-by: Bret Sepulveda <bsep@chromium.org>
Reviewed-by: Trent Apted <tapted@chromium.org>
Commit-Queue: Peter Boström <pbos@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545172}

chrome/browser/ui/views/harmony/chrome_typography.cc

@@ -54,6 +54,7 @@ const gfx::FontList& LegacyTypographyProvider::GetFont(int context,
 
   switch (style) {
     case STYLE_EMPHASIZED:
+    case STYLE_EMPHASIZED_SECONDARY:
       font_weight = gfx::Font::Weight::BOLD;
       break;
   }
@@ -66,8 +67,10 @@ SkColor LegacyTypographyProvider::GetColor(const views::View& view,
                                            int context,
                                            int style) const {
   // Use "disabled grey" for HINT and SECONDARY when Harmony is disabled.
-  if (style == STYLE_HINT || style == STYLE_SECONDARY)
+  if (style == STYLE_HINT || style == STYLE_SECONDARY ||
+      style == STYLE_EMPHASIZED_SECONDARY) {
     style = views::style::STYLE_DISABLED;
+  }
 
   return DefaultTypographyProvider::GetColor(view, context, style);
 }

chrome/browser/ui/views/harmony/chrome_typography.h

@@ -59,6 +59,10 @@ enum ChromeTextStyle {
   // Used to draw attention to a section of body text such as an extension name
   // or hostname.
   STYLE_EMPHASIZED,
+
+  // Emphasized secondary style. Like STYLE_EMPHASIZED but styled to match
+  // surrounding STYLE_SECONDARY text.
+  STYLE_EMPHASIZED_SECONDARY,
 };
 
 // Sets the |size_delta| and |font_weight| for text that should not be affected

chrome/browser/ui/views/harmony/harmony_typography_provider.cc

@@ -142,7 +142,7 @@ const gfx::FontList& HarmonyTypographyProvider::GetFont(int context,
 
   // Use a bold style for emphasized text in body contexts, and ignore |style|
   // otherwise.
-  if (style == STYLE_EMPHASIZED) {
+  if (style == STYLE_EMPHASIZED || style == STYLE_EMPHASIZED_SECONDARY) {
     switch (context) {
       case CONTEXT_BODY_TEXT_SMALL:
       case CONTEXT_BODY_TEXT_LARGE:
@@ -194,6 +194,7 @@ SkColor HarmonyTypographyProvider::GetColor(const views::View& view,
     case views::style::STYLE_LINK:
       return gfx::kGoogleBlue700;
     case STYLE_SECONDARY:
+    case STYLE_EMPHASIZED_SECONDARY:
     case STYLE_HINT:
       return SkColorSetRGB(0x75, 0x75, 0x75);
     case STYLE_RED:

chrome/browser/ui/views/settings_reset_prompt_dialog.cc

@@ -44,8 +44,9 @@ SettingsResetPromptDialog::SettingsResetPromptDialog(
   views::StyledLabel* dialog_label =
       new views::StyledLabel(controller_->GetMainText(), /*listener=*/nullptr);
   dialog_label->SetTextContext(CONTEXT_BODY_TEXT_LARGE);
+  dialog_label->SetDefaultTextStyle(STYLE_SECONDARY);
   views::StyledLabel::RangeStyleInfo url_style;
-  url_style.text_style = STYLE_EMPHASIZED;
+  url_style.text_style = STYLE_EMPHASIZED_SECONDARY;
   dialog_label->AddStyleRange(controller_->GetMainTextUrlRange(), url_style);
   AddChildView(dialog_label);
 }