Fix up extension badge text drawing....

app/gfx/font.h

 // 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.
 
 #ifndef APP_GFX_FONT_H_
 #define APP_GFX_FONT_H_
 
 #include "build/build_config.h"
 
 #include <string>
@@ skipping 79 matching lines @@
   // the specified length of characters.
   // Call GetStringWidth() to retrieve the actual number.
   int GetExpectedTextWidth(int length) const;
 
   // Returns the style of the font.
   int style() const;
 
   // Font Name.
   // It is actually a font family name, because Skia expects a family name
   // and not a font name.
-  std::wstring FontName();
+  const std::wstring& FontName() const;
 
   // Font Size.
   int FontSize();
 
   NativeFont nativeFont() const;
 
   // Creates a font with the default name and style.
   Font();
 
 #if defined(OS_WIN)
@@ skipping 57 matching lines @@
              int dlu_base_x);
     ~HFontRef();
 
     // Accessors
     HFONT hfont() const { return hfont_; }
     int height() const { return height_; }
     int baseline() const { return baseline_; }
     int ave_char_width() const { return ave_char_width_; }
     int style() const { return style_; }
     int dlu_base_x() const { return dlu_base_x_; }
+    const std::wstring& font_name() const { return font_name_; }
 
    private:
     const HFONT hfont_;
     const int height_;
     const int baseline_;
     const int ave_char_width_;
     const int style_;
     // Constants used in converting dialog units to pixels.
     const int dlu_base_x_;
+    const std::wstring font_name_;
 
     DISALLOW_COPY_AND_ASSIGN(HFontRef);
   };
 
   // Returns the base font ref. This should ONLY be invoked on the
   // UI thread.
   static HFontRef* GetBaseFontRef();
 
   // Creates and returns a new HFONTRef from the specified HFONT.
   static HFontRef* CreateHFontRef(HFONT font);
@@ skipping 58 matching lines @@
   int height_;
   int ascent_;
   int avg_width_;
 #endif
 
 };
 
 }  // namespace gfx
 
 #endif  // APP_GFX_FONT_H_