Allow various font weights in gfx.

ui/base/resource/resource_bundle.h

Index: ui/base/resource/resource_bundle.h
diff --git a/ui/base/resource/resource_bundle.h b/ui/base/resource/resource_bundle.h
index 61f2861b1e9db8e63f5c4ce103233a0e864598dc..e6d3612548eb963a97e030e6d49a6c594af94ed5 100644
--- a/ui/base/resource/resource_bundle.h
+++ b/ui/base/resource/resource_bundle.h
@@ -246,12 +246,14 @@ class UI_BASE_EXPORT ResourceBundle {
   // The result is always cached and exists for the lifetime of the process.
   const gfx::FontList& GetFontListWithDelta(
       int size_delta,
-      gfx::Font::FontStyle style = gfx::Font::NORMAL);
+      gfx::Font::FontStyle style = gfx::Font::NORMAL,
+      gfx::Font::Weight weight = gfx::Font::Weight::NORMAL);
 
   // Returns the primary font from the FontList given by GetFontListWithDelta().
   const gfx::Font& GetFontWithDelta(
       int size_delta,
-      gfx::Font::FontStyle style = gfx::Font::NORMAL);
+      gfx::Font::FontStyle style = gfx::Font::NORMAL,
+      gfx::Font::Weight weight = gfx::Font::Weight::NORMAL);

[sky, 2016/03/31 17:04:08]

The style guide says not to use defaults like this. You can either update all
call sites, or add a variant: GetFontWithDeltaAndWeight.

[Peter Kasting, 2016/03/31 21:04:49]

No longer true (style guide was recently updated).  See
http://google.github.io/styleguide/cppguide.html#Default_Arguments for the
current ruling.

I think defaults are likely OK here, but check the guidelines to be sure.

[Mikus, 2016/04/04 12:16:25]

Acknowledged.

 
   // Deprecated. Returns fonts using hard-coded size deltas implied by |style|.
   const gfx::FontList& GetFontList(FontStyle style);
@@ -314,6 +316,8 @@ class UI_BASE_EXPORT ResourceBundle {
   class ResourceBundleImageSource;
   friend class ResourceBundleImageSource;
 
+  struct FontKey;
+
   typedef base::hash_map<int, base::string16> IdToStringMap;
 
   // Ctor/dtor are private, since we're a singleton.
@@ -433,7 +437,7 @@ class UI_BASE_EXPORT ResourceBundle {
   // platform base font size, plus style, to the FontList. Cached to avoid
   // repeated GDI creation/destruction and font derivation.
   // Must be accessed only while holding |images_and_fonts_lock_|.
-  std::map<std::pair<int, gfx::Font::FontStyle>, gfx::FontList> font_cache_;
+  std::map<FontKey, gfx::FontList> font_cache_;
 
   base::FilePath overridden_pak_path_;