Rework gfx::Font by moving platform-specific code into inner classes....

chrome/common/extensions/extension_action.cc

 // Copyright (c) 2010 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/common/extensions/extension_action.h"
 
 #include <algorithm>
 
 #include "app/resource_bundle.h"
 #include "base/utf_string_conversions.h"
@@ skipping 58 matching lines @@
     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 = SkTypeface::CreateFromName(
-          WideToUTF8(base_font.FontName()).c_str(), SkTypeface::kNormal);
+          WideToUTF8(base_font.GetFontName()).c_str(), SkTypeface::kNormal);
     }
 
     text_paint->setTypeface(typeface);
     // |text_paint| adds its own ref. Release the ref from CreateFontName.
     typeface->unref();
   }
   return text_paint;
 }
 
 }  // namespace
@@ skipping 93 matching lines @@
   // text was too large.
   rect.fLeft += kPadding;
   rect.fRight -= kPadding;
   canvas->AsCanvasSkia()->clipRect(rect);
   canvas->AsCanvasSkia()->drawText(text.c_str(), text.size(),
                                    rect.fLeft + (rect.width() - text_width) / 2,
                                    rect.fTop + kTextSize + kTopTextPadding,
                                    *text_paint);
   canvas->Restore();
 }