Allow various font weights in gfx.

chrome/browser/ui/extensions/icon_with_badge_image_source.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 "chrome/browser/ui/extensions/icon_with_badge_image_source.h"
 
 #include <algorithm>
 #include <cmath>
 #include <utility>
 
@@ skipping 49 matching lines @@
 #else
   const char kPreferredTypeface[] = "Arial";
 #endif
 
   static SkPaint* text_paint = NULL;
   if (!text_paint) {
     text_paint = new SkPaint;
     text_paint->setAntiAlias(true);
     text_paint->setTextAlign(SkPaint::kLeft_Align);
 
-    skia::RefPtr<SkTypeface> typeface = skia::AdoptRef(
-        SkTypeface::CreateFromName(kPreferredTypeface, SkTypeface::kBold));
+    skia::RefPtr<SkTypeface> typeface =
+        skia::AdoptRef(SkTypeface::CreateFromName(
+            kPreferredTypeface, SkFontStyle(SkTypeface::kBold)));
     // Skia doesn't do any font fallback---if the user is missing the font then
     // typeface will be NULL. If we don't do manual fallback then we'll crash.
     if (typeface) {
       text_paint->setFakeBoldText(true);
     } else {
       // Fall back to the system font. We don't bold it because we aren't sure
       // how it will look.
       // For the most part this code path will only be hit on Linux systems
       // that don't have Arial.
       ResourceBundle& rb = ResourceBundle::GetSharedInstance();
       const gfx::Font& base_font = rb.GetFont(ResourceBundle::BaseFont);
       typeface = skia::AdoptRef(SkTypeface::CreateFromName(
-          base_font.GetFontName().c_str(), SkTypeface::kNormal));
+          base_font.GetFontName().c_str(), SkFontStyle()));
       DCHECK(typeface);
     }
 
     text_paint->setTypeface(typeface.get());
     // |text_paint| adds its own ref. Release the ref from CreateFontName.
   }
   return text_paint;
 }
 
 gfx::ImageSkiaRep ScaleImageSkiaRep(const gfx::ImageSkiaRep& rep,
@@ skipping 194 matching lines @@
 }
 
 void IconWithBadgeImageSource::PaintBlockedActionDecoration(
     gfx::Canvas* canvas) {
   canvas->Save();
   gfx::ImageSkia img = *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
       IDR_BLOCKED_EXTENSION_SCRIPT);
   canvas->DrawImageInt(img, size().width() - img.width(), 0);
   canvas->Restore();
 }