Use a larger font in the extension badge when possible.

chrome/browser/ui/extensions/icon_with_badge_image_source.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/extensions/icon_with_badge_image_source.h"
 
 #include <algorithm>
 #include <cmath>
 #include <utility>
 
@@ skipping 162 matching lines @@
     background_color = badge_->background_color;
 
   canvas->Save();
 
   SkPaint* text_paint = nullptr;
   int text_width = 0;
   ResourceBundle* rb = &ResourceBundle::GetSharedInstance();
   gfx::FontList base_font = rb->GetFontList(ResourceBundle::BaseFont)
                                 .DeriveWithHeightUpperBound(kBadgeHeight);
   base::string16 utf16_text = base::UTF8ToUTF16(badge_->text);
+
+  // See if we can squeeze a slightly larger font into the badge given the
+  // actual string that is to be displayed.
+  const int kMaxIncrementAttempts = 5;
+  for (size_t i = 0; i < kMaxIncrementAttempts; ++i) {
+    int w, h;

[Devlin, 2016/05/26 20:50:25]

nit: I think style requires these to be initialized (and on separate lines).

[Evan Stade, 2016/05/26 21:49:38]

Done.

+    gfx::FontList bigger_font = base_font.Derive(1, 0);
+    gfx::Canvas::SizeStringInt(utf16_text, bigger_font, &w, &h, 0,
+                               gfx::Canvas::NO_ELLIPSIS);
+    if (h > kBadgeHeight)
+      break;
+    base_font = bigger_font;
+  }
+
   if (ui::MaterialDesignController::IsModeMaterial()) {
     text_width =
         std::min(kMaxTextWidth, canvas->GetStringWidth(utf16_text, base_font));
   } else {
     text_paint = GetBadgeTextPaintSingleton();
     text_paint->setColor(text_color);
     float scale = canvas->image_scale();
 
     // Calculate text width. Font width may not be linear with respect to the
     // scale factor (e.g. when hinting is applied), so we need to use the font
@@ skipping 97 matching lines @@
 }
 
 void IconWithBadgeImageSource::PaintBlockedActionDecoration(
     gfx::Canvas* canvas) {
   canvas->Save();
   gfx::ImageSkia img = *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
       IDR_BLOCKED_EXTENSION_SCRIPT);
   canvas->DrawImageInt(img, size().width() - img.width(), 0);
   canvas->Restore();
 }