"Bootstrap" a toolkit-views Typography spec.

chrome/browser/ui/views/passwords/credentials_item_view.cc

 // Copyright 2014 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/passwords/credentials_item_view.h"
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/passwords/manage_passwords_view_utils.h"
+#include "chrome/browser/ui/views/harmony/chrome_typography.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
 #include "components/autofill/core/common/password_form.h"
+#include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/path.h"
 #include "ui/views/border.h"
 #include "ui/views/bubble/tooltip_icon.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/layout_constants.h"
 
 namespace {
@@ skipping 60 matching lines @@
          image.Height() >= kAvatarImageSize);
   UpdateAvatar(image.AsImageSkia());
   if (form_->icon_url.is_valid()) {
     // Fetch the actual avatar.
     AccountAvatarFetcher* fetcher = new AccountAvatarFetcher(
         form_->icon_url, weak_ptr_factory_.GetWeakPtr());
     fetcher->Start(request_context);
   }
   AddChildView(image_view_);
 
-  ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
+  // TODO(tapted): Check these against the spec on http://crbug.com/651681.
+  const int kLabelContext =
+      ui::MaterialDesignController::IsSecondaryUiMaterial()
+          ? CONTEXT_DIALOG_TEXT_SMALL
+          : CONTEXT_DEPRECATED_SMALL;
+  constexpr int kUpperLabelStyle = views::typography::STYLE_PRIMARY;

[Peter Kasting, 2017/03/17 02:26:00]

Nit: Might just inline these two below, seems just as clear as the temps

[tapted, 2017/03/17 10:33:10]

Done.

+  constexpr int kLowerLabelStyle = STYLE_SECONDARY;
+
   if (!upper_text.empty()) {
-    upper_label_ = new views::Label(
-        upper_text, rb->GetFontList(ui::ResourceBundle::SmallFont));
+    upper_label_ =
+        new views::Label(upper_text, kLabelContext, kUpperLabelStyle);
     upper_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     AddChildView(upper_label_);
   }
 
   if (!lower_text.empty()) {
-    lower_label_ = new views::Label(
-        lower_text, rb->GetFontList(ui::ResourceBundle::SmallFont));
+    lower_label_ =
+        new views::Label(lower_text, kLabelContext, kLowerLabelStyle);
     lower_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     lower_label_->SetMultiLine(true);
     AddChildView(lower_label_);
   }
 
   if (form_->is_public_suffix_match) {
     info_icon_ = new views::TooltipIcon(
         base::UTF8ToUTF16(form_->origin.GetOrigin().spec()));
     AddChildView(info_icon_);
   }
@@ skipping 73 matching lines @@
                    child_area.CenterPoint().y() - info_icon_->height() / 2));
   }
 }
 
 void CredentialsItemView::OnPaint(gfx::Canvas* canvas) {
   if (state() == STATE_PRESSED || state() == STATE_HOVERED)
     canvas->DrawColor(hover_color_);
 
   CustomButton::OnPaint(canvas);
 }