Allow various font weights in gfx.

ui/views/examples/text_example.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/views/examples/text_example.h"
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font_list.h"
@@ skipping 75 matching lines @@
 
   int flags() const { return flags_; }
   void set_flags(int flags) { flags_ = flags; }
   void set_text(const base::string16& text) { text_ = text; }
   void set_halo(bool halo) { halo_ = halo; }
   void set_elide(gfx::ElideBehavior elide) { elide_ = elide; }
 
   int GetStyle() const { return font_list_.GetFontStyle(); }
   void SetStyle(int style) { font_list_ = font_list_.DeriveWithStyle(style); }
 
+  gfx::Font::Weight GetWeight() const { return font_list_.GetFontWeight(); }
+  void SetWeight(gfx::Font::Weight weight) {
+    font_list_ = font_list_.DeriveWithWeight(weight);
+  }
+
  private:
   // The font used for drawing the text.
   gfx::FontList font_list_;
 
   // The text to draw.
   base::string16 text_;
 
   // Text flags for passing to |DrawStringRect()|.
   int flags_;
 
@@ skipping 77 matching lines @@
   layout->StartRow(1, 1);
   layout->AddView(text_view_);
   layout->AddPaddingRow(0, 8);
 }
 
 void TextExample::ButtonPressed(Button* button, const ui::Event& event) {
   int flags = text_view_->flags();
   int style = text_view_->GetStyle();
   SetFlagFromCheckbox(multiline_checkbox_, &flags, gfx::Canvas::MULTI_LINE);
   SetFlagFromCheckbox(break_checkbox_, &flags, gfx::Canvas::CHARACTER_BREAK);
-  SetFlagFromCheckbox(bold_checkbox_, &style, gfx::Font::BOLD);
   SetFlagFromCheckbox(italic_checkbox_, &style, gfx::Font::ITALIC);
   SetFlagFromCheckbox(underline_checkbox_, &style, gfx::Font::UNDERLINE);
   text_view_->set_halo(halo_checkbox_->checked());
   text_view_->set_flags(flags);
   text_view_->SetStyle(style);
+  text_view_->SetWeight(bold_checkbox_->checked() ? gfx::Font::Weight::BOLD
+                                                  : gfx::Font::Weight::NORMAL);
   text_view_->SchedulePaint();
 }
 
 void TextExample::OnPerformAction(Combobox* combobox) {
   int flags = text_view_->flags();
   if (combobox == h_align_cb_) {
     flags &= ~(gfx::Canvas::TEXT_ALIGN_LEFT |
                gfx::Canvas::TEXT_ALIGN_CENTER |
                gfx::Canvas::TEXT_ALIGN_RIGHT);
     switch (combobox->selected_index()) {
@@ skipping 48 matching lines @@
         flags |= gfx::Canvas::HIDE_PREFIX;
         break;
     }
   }
   text_view_->set_flags(flags);
   text_view_->SchedulePaint();
 }
 
 }  // namespace examples
 }  // namespace views