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

views/controls/menu/native_menu_gtk.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 "views/controls/menu/native_menu_gtk.h"
 
 #include <algorithm>
 #include <map>
 #include <string>
 
@@ skipping 298 matching lines @@
       NOTREACHED();
       break;
   }
 
   // Label font.
   const gfx::Font* font = model_->GetLabelFontAt(index);
   if (font) {
     // The label item is the first child of the menu item.
     GtkWidget* label_widget = GTK_BIN(menu_item)->child;
     DCHECK(label_widget && GTK_IS_LABEL(label_widget));
-    gtk_widget_modify_font(label_widget,
-                           gfx::Font::PangoFontFromGfxFont(*font));
+    PangoFontDescription* pfd = font->GetNativeFont();
+    gtk_widget_modify_font(label_widget, pfd);
+    pango_font_description_free(pfd);
   }
 
   if (type == menus::MenuModel::TYPE_SUBMENU) {
     Menu2* submenu = new Menu2(model_->GetSubmenuModelAt(index));
     static_cast<NativeMenuGtk*>(submenu->wrapper_.get())->set_parent(this);
     g_object_set_data(G_OBJECT(menu_item), "submenu", submenu);
     gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_item),
                               submenu->GetNativeMenu());
   }
 
@@ skipping 161 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // MenuWrapper, public:
 
 // static
 MenuWrapper* MenuWrapper::CreateWrapper(Menu2* menu) {
   return new NativeMenuGtk(menu);
 }
 
 }  // namespace views