Allow various font weights in gfx.

ui/gfx/font.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 "ui/gfx/font.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "ui/gfx/platform_font.h"
 
@@ skipping 23 matching lines @@
 }
 
 Font::Font(const std::string& font_name, int font_size)
     : platform_font_(PlatformFont::CreateFromNameAndSize(font_name,
                                                          font_size)) {
 }
 
 Font::~Font() {
 }
 
-Font Font::Derive(int size_delta, int style) const {
-  return platform_font_->DeriveFont(size_delta, style);
+Font Font::Derive(int size_delta, int style, gfx::Font::Weight weight) const {
+  return platform_font_->DeriveFont(size_delta, style, weight);
 }
 
 int Font::GetHeight() const {
   return platform_font_->GetHeight();
 }
 
 int Font::GetBaseline() const {
   return platform_font_->GetBaseline();
 }
 
@@ skipping 14 matching lines @@
 }
 
 std::string Font::GetActualFontNameForTesting() const {
   return platform_font_->GetActualFontNameForTesting();
 }
 
 int Font::GetFontSize() const {
   return platform_font_->GetFontSize();
 }
 
+gfx::Font::Weight Font::GetWeight() const {

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

Remove gfx::

+  return platform_font_->GetWeight();
+}
+
 const FontRenderParams& Font::GetFontRenderParams() const {
   return platform_font_->GetFontRenderParams();
 }
 
 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_IOS)
 NativeFont Font::GetNativeFont() const {
   return platform_font_->GetNativeFont();
 }
 #endif
 
+#ifndef NDEBUG
+std::ostream& operator<<(std::ostream& stream, const gfx::Font::Weight weight) {

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

Remove gfx::

+  return stream << static_cast<int>(weight);
+}
+#endif
+
 }  // namespace gfx