"Bootstrap" a toolkit-views Typography spec.

chrome/browser/ui/views/content_setting_bubble_contents.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/content_setting_bubble_contents.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 212 matching lines @@
                         GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(0, related_control_horizontal_spacing);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
 
   const ContentSettingBubbleModel::BubbleContent& bubble_content =
       content_setting_bubble_model_->bubble_content();
   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;
   }
 
   if (!bubble_content.message.empty()) {
     views::Label* message_label = new views::Label(bubble_content.message);
     layout->AddPaddingRow(0, unrelated_control_vertical_spacing);
     message_label->SetMultiLine(true);
     message_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
@@ skipping 127 matching lines @@
       combobox->SetSelectedIndex(
           model->GetDevices().empty()
               ? 0
               : model->GetDeviceIndex(i->second.selected_device));
       layout->AddView(combobox);
 
       bubble_content_empty = false;
     }
   }
 
-  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) {
     layout->StartRow(0, kSingleColumnSetId);
     views::Label* section_title = new views::Label(base::UTF8ToUTF16(i->title));
     section_title->SetMultiLine(true);
     section_title->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     layout->AddView(section_title, 1, 1, GridLayout::FILL, GridLayout::LEADING);
     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;
   }
 
   if (!bubble_content.custom_link.empty()) {
     custom_link_ =
         new views::Link(base::UTF8ToUTF16(bubble_content.custom_link));
     custom_link_->SetEnabled(bubble_content.custom_link_enabled);
     custom_link_->set_listener(this);
     if (!bubble_content_empty)
@@ skipping 94 matching lines @@
   DCHECK(i != list_item_links_.end());
   content_setting_bubble_model_->OnListItemClicked(i->second);
 }
 
 void ContentSettingBubbleContents::OnPerformAction(views::Combobox* combobox) {
   MediaComboboxModel* model =
       static_cast<MediaComboboxModel*>(combobox->model());
   content_setting_bubble_model_->OnMediaMenuClicked(
       model->type(), model->GetDevices()[combobox->selected_index()].id);
 }