"Bootstrap" a toolkit-views Typography spec.

chrome/browser/ui/views/content_setting_bubble_contents.cc

Index: chrome/browser/ui/views/content_setting_bubble_contents.cc
diff --git a/chrome/browser/ui/views/content_setting_bubble_contents.cc b/chrome/browser/ui/views/content_setting_bubble_contents.cc
index b8c68f2d6623ccfa3caf7554b80fcfb91f0026a0..6a48b4db1ee2ad912d5d8f4513cbd292c023b3b8 100644
--- a/chrome/browser/ui/views/content_setting_bubble_contents.cc
+++ b/chrome/browser/ui/views/content_setting_bubble_contents.cc
@@ -230,14 +230,14 @@ void ContentSettingBubbleContents::Init() {
   bool bubble_content_empty = true;
 
   if (!bubble_content.title.empty()) {
-    views::Label* title_label = new views::Label(bubble_content.title);
+    const views::TextContext kTitleContext =
+        layout_delegate->IsHarmonyMode()
+            ? views::TextContext::DIALOG_TITLE
+            : views::TextContext::DIALOG_TEXT_SMALL;

[Peter Kasting, 2017/03/14 23:53:33]

Nit: It would be nice to just use DIALOG_TITLE unconditionally if it didn't look
too bad in pre-Harmony.  (Same comment applies anywhere else we're doing a
conditional like this.  However, for the sake of sanity, it would be better to
make such a change by first landing a separate behavior-change-only CL, then
landing a CL here that changes the calling conventions without changing
behavior.)

[tapted, 2017/03/15 08:26:24]

The difference between these two fonts is significant -- added screengrabs to
http://crbug.com/700196#c1

(here I'm just moving an existing conditional up :).

Also, (for other cases) if we can land the "bootstrap" first it will give us a
way to go directly to a views::TextContext rather than doing more verbose things
with ui::ResourceBundle::GetSharedInstance()->GetFontListWithDelta(..) to get to
harmony-mode values.

[Peter Kasting, 2017/03/15 10:01:48]

Honestly I'd be fine with this if we shortened the text string, which I imagine
we'll end up wanting for Harmony anyways.
I'm fine landing in whatever order, I mostly just want to kill as many
pre-Harmony conditionals as I can as fast as I can :P

+    views::Label* title_label =
+        new views::Label(bubble_content.title, kTitleContext);
     title_label->SetMultiLine(true);
     title_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-    if (layout_delegate->IsHarmonyMode()) {
-      ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-      title_label->SetFontList(
-          rb.GetFontListWithDelta(ui::kTitleFontSizeDelta));
-    }
     layout->StartRow(0, kSingleColumnSetId);
     layout->AddView(title_label);
     bubble_content_empty = false;
@@ -385,9 +385,6 @@ void ContentSettingBubbleContents::Init() {
     }
   }
 
-  const gfx::FontList& domain_font =
-      ui::ResourceBundle::GetSharedInstance().GetFontList(
-          ui::ResourceBundle::BoldFont);
   for (std::vector<ContentSettingBubbleModel::DomainList>::const_iterator i(
            bubble_content.domain_lists.begin());
        i != bubble_content.domain_lists.end(); ++i) {
@@ -399,7 +396,10 @@ void ContentSettingBubbleContents::Init() {
     for (std::set<std::string>::const_iterator j = i->hosts.begin();
          j != i->hosts.end(); ++j) {
       layout->StartRow(0, indented_kSingleColumnSetId);
-      layout->AddView(new views::Label(base::UTF8ToUTF16(*j), domain_font));
+      // TODO(tapted): Verify this when we have a mock. http://crbug.com/700196.
+      layout->AddView(new views::Label(base::UTF8ToUTF16(*j),
+                                       views::TextContext::DIALOG_MESSAGE,
+                                       views::TextStyle::WEB_DOMAIN));
     }
     bubble_content_empty = false;
   }