Allow various font weights in gfx.

ui/gfx/platform_font_win.h

Index: ui/gfx/platform_font_win.h
diff --git a/ui/gfx/platform_font_win.h b/ui/gfx/platform_font_win.h
index b03ed810365f525f47137b5c916c9c54752c7dcc..763c2fa0fbe85449c4b2f7b56f8e68039f846511 100644
--- a/ui/gfx/platform_font_win.h
+++ b/ui/gfx/platform_font_win.h
@@ -50,15 +50,12 @@ class GFX_EXPORT PlatformFontWin : public PlatformFont {
   // name could not be retrieved, returns GetFontName().
   std::string GetLocalizedFontName() const;
 
-  // Returns a derived Font with the specified |style| and maximum |height|.
-  // The returned Font will be the largest font size with a height <= |height|,
-  // since a size with the exact specified |height| may not necessarily exist.
-  // GetMinimumFontSize() may impose a font size that is taller than |height|.
-  Font DeriveFontWithHeight(int height, int style);
-
   // Overridden from PlatformFont:
-  Font DeriveFont(int size_delta, int style) const override;
+  Font DeriveFont(int size_delta,
+                  int style,
+                  gfx::Font::Weight weight) const override;

[Alexei Svitkine (slow), 2016/04/05 16:38:52]

Remove gfx::

   int GetHeight() override;
+  gfx::Font::Weight GetWeight() const override;

[Alexei Svitkine (slow), 2016/04/05 16:38:52]

Remove gfx::

   int GetBaseline() override;
   int GetCapHeight() override;
   int GetExpectedTextWidth(int length) override;
@@ -106,6 +103,7 @@ class GFX_EXPORT PlatformFontWin : public PlatformFont {
              int baseline,
              int cap_height,
              int ave_char_width,
+             gfx::Font::Weight weight,

[Alexei Svitkine (slow), 2016/04/05 16:38:52]

Remove gfx::

              int style);
 
     // Accessors
@@ -114,6 +112,7 @@ class GFX_EXPORT PlatformFontWin : public PlatformFont {
     int baseline() const { return baseline_; }
     int cap_height() const { return cap_height_; }
     int ave_char_width() const { return ave_char_width_; }
+    gfx::Font::Weight weight() const { return weight_; }

[Alexei Svitkine (slow), 2016/04/05 16:38:52]

Remove gfx::

     int style() const { return style_; }
     const std::string& font_name() const { return font_name_; }
     int font_size() const { return font_size_; }
@@ -140,6 +139,7 @@ class GFX_EXPORT PlatformFontWin : public PlatformFont {
     const int baseline_;
     const int cap_height_;
     const int ave_char_width_;
+    const gfx::Font::Weight weight_;

[Alexei Svitkine (slow), 2016/04/05 16:38:52]

Remove gfx::

     const int style_;
     // Average character width in dialog units. This is queried lazily from the
     // system, with an initial value of -1 meaning it hasn't yet been queried.