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

app/resource_bundle.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 "app/resource_bundle.h"
 
 #include "base/data_pack.h"
 #include "base/lock.h"
 #include "base/logging.h"
 #include "base/string_piece.h"
@@ skipping 154 matching lines @@
   }
 }
 
 void ResourceBundle::LoadFontsIfNecessary() {
   AutoLock lock_scope(*lock_);
   if (!base_font_.get()) {
     base_font_.reset(new gfx::Font());
 
     bold_font_.reset(new gfx::Font());
     *bold_font_ =
-        base_font_->DeriveFont(0, base_font_->style() | gfx::Font::BOLD);
+        base_font_->DeriveFont(0, base_font_->GetStyle() | gfx::Font::BOLD);
 
     small_font_.reset(new gfx::Font());
     *small_font_ = base_font_->DeriveFont(-2);
 
     medium_font_.reset(new gfx::Font());
     *medium_font_ = base_font_->DeriveFont(3);
 
     medium_bold_font_.reset(new gfx::Font());
     *medium_bold_font_ =
-        base_font_->DeriveFont(3, base_font_->style() | gfx::Font::BOLD);
+        base_font_->DeriveFont(3, base_font_->GetStyle() | gfx::Font::BOLD);
 
     large_font_.reset(new gfx::Font());
     *large_font_ = base_font_->DeriveFont(8);
   }
 }
 
 const gfx::Font& ResourceBundle::GetFont(FontStyle style) {
   LoadFontsIfNecessary();
   switch (style) {
     case BoldFont:
@@ skipping 27 matching lines @@
 
 bool ResourceBundle::LoadedDataPack::GetStringPiece(
     int resource_id, base::StringPiece* data) const {
   return data_pack_->GetStringPiece(static_cast<uint32>(resource_id), data);
 }
 
 RefCountedStaticMemory* ResourceBundle::LoadedDataPack::GetStaticMemory(
     int resource_id) const {
   return data_pack_->GetStaticMemory(resource_id);
 }