Fix up extension badge text drawing....

app/gfx/font_win.cc

 // Copyright (c) 2006-2008 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 "app/gfx/font.h"
 
 #include <windows.h>
 #include <math.h>
 
 #include <algorithm>
@@ skipping 93 matching lines @@
         AdjustFontSize(metrics.lfMessageFont.lfHeight, 0);
     HFONT font = CreateFontIndirect(&metrics.lfMessageFont);
     DLOG_ASSERT(font);
     base_font_ref_ = Font::CreateHFontRef(font);
     // base_font_ref_ is global, up the ref count so it's never deleted.
     base_font_ref_->AddRef();
   }
   return base_font_ref_;
 }
 
-std::wstring Font::FontName() {
-  LOGFONT font_info;
-  GetObject(hfont(), sizeof(LOGFONT), &font_info);
-  return (std::wstring(font_info.lfFaceName));
+const std::wstring& Font::FontName() const {
+  return font_name();
 }
 
 int Font::FontSize() {
   LOGFONT font_info;
   GetObject(hfont(), sizeof(LOGFONT), &font_info);
   long lf_height = font_info.lfHeight;
   HDC hdc = GetDC(NULL);
   int device_caps = GetDeviceCaps(hdc, LOGPIXELSY);
   int font_size = 0;
   if (device_caps != 0) {
@@ skipping 10 matching lines @@
          int ave_char_width,
          int style,
          int dlu_base_x)
     : hfont_(hfont),
       height_(height),
       baseline_(baseline),
       ave_char_width_(ave_char_width),
       style_(style),
       dlu_base_x_(dlu_base_x) {
   DLOG_ASSERT(hfont);
+
+  LOGFONT font_info;
+  GetObject(hfont(), sizeof(LOGFONT), &font_info);
+  font_name_ = std::wstring(font_info.lfFaceName);
 }
 
 Font::HFontRef::~HFontRef() {
   DeleteObject(hfont_);
 }
 
 Font Font::DeriveFont(int size_delta, int style) const {
   LOGFONT font_info;
   GetObject(hfont(), sizeof(LOGFONT), &font_info);
   font_info.lfHeight = AdjustFontSize(font_info.lfHeight, size_delta);
@@ skipping 52 matching lines @@
   }
   if (font_metrics.tmWeight >= kTextMetricWeightBold) {
     style |= Font::BOLD;
   }
 
   return new HFontRef(font, height, baseline, ave_char_width, style,
                       dlu_base_x);
 }
 
 }  // namespace gfx