ChromeFont->gfx::Font...

app/resource_bundle.h

 // Copyright (c) 2006-2009 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.
 
 #ifndef APP_RESOURCE_BUNDLE_H_
 #define APP_RESOURCE_BUNDLE_H_
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/lock.h"
 #include "base/scoped_ptr.h"
 #include "base/string16.h"
 
 #if defined(OS_LINUX) || defined(OS_MACOSX)
 namespace base {
 class DataPack;
-};
+}
 #endif
 #if defined(OS_LINUX)
 typedef struct _GdkPixbuf GdkPixbuf;
 #endif
-class ChromeFont;
+namespace gfx{
+class Font;
+}
 class SkBitmap;
 typedef uint32 SkColor;
 class StringPiece;
 
 // ResourceBundle is a central facility to load images and other resources,
 // such as theme graphics.
 // Every resource is loaded only once.
 class ResourceBundle {
  public:
   // An enumeration of the various font styles used throughout Chrome.
@@ skipping 53 matching lines @@
 
   // Like GetDataResource(), but avoids copying the resource.  Instead, it
   // returns a StringPiece which points into the actual resource in the image.
   StringPiece GetRawDataResource(int resource_id);
 
   // Get a localized string given a message id.  Returns an empty
   // string if the message_id is not found.
   string16 GetLocalizedString(int message_id);
 
   // Returns the font for the specified style.
-  ChromeFont GetFont(FontStyle style);
+  gfx::Font GetFont(FontStyle style);
 
 #if defined(OS_WIN)
   // Loads and returns an icon from the theme dll.
   HICON LoadThemeIcon(int icon_id);
 
   // Loads and returns a cursor from the app module.
   HCURSOR LoadCursor(int cursor_id);
 #elif defined(OS_LINUX)
   // Gets the GdkPixbuf with the specified resource_id, first by looking into
   // the theme data, than in the current module data if applicable.  Returns a
@@ skipping 31 matching lines @@
   ResourceBundle();
   ~ResourceBundle();
 
   // Free skia_images_.
   void FreeImages();
 
   // Try to load the main resources and the locale specific strings from an
   // external data module.
   void LoadResources(const std::wstring& pref_locale);
 
-  // Initialize all the ChromeFont members if they haven't yet been initialized.
+  // Initialize all the gfx::Font members if they haven't yet been initialized.
   void LoadFontsIfNecessary();
 
   // Returns the full pathname of the locale file to load.  May return an empty
   // string if no locale data files are found.
   FilePath GetLocaleFilePath(const std::wstring& pref_locale);
 
   // Loads the raw bytes of a resource from |module| into |bytes|,
   // without doing any processing or interpretation of
   // the resource. Returns whether we successfully read the resource.
   static bool LoadResourceBytes(DataHandle module,
@@ skipping 17 matching lines @@
   // Cached images. The ResourceBundle caches all retrieved bitmaps and keeps
   // ownership of the pointers.
   typedef std::map<int, SkBitmap*> SkImageMap;
   SkImageMap skia_images_;
 #if defined(OS_LINUX)
   typedef std::map<int, GdkPixbuf*> GdkPixbufMap;
   GdkPixbufMap gdk_pixbufs_;
 #endif
 
   // The various fonts used. Cached to avoid repeated GDI creation/destruction.
-  scoped_ptr<ChromeFont> base_font_;
-  scoped_ptr<ChromeFont> small_font_;
-  scoped_ptr<ChromeFont> medium_font_;
-  scoped_ptr<ChromeFont> medium_bold_font_;
-  scoped_ptr<ChromeFont> large_font_;
-  scoped_ptr<ChromeFont> web_font_;
+  scoped_ptr<gfx::Font> base_font_;
+  scoped_ptr<gfx::Font> small_font_;
+  scoped_ptr<gfx::Font> medium_font_;
+  scoped_ptr<gfx::Font> medium_bold_font_;
+  scoped_ptr<gfx::Font> large_font_;
+  scoped_ptr<gfx::Font> web_font_;
 
   static ResourceBundle* g_shared_instance_;
 
   DISALLOW_EVIL_CONSTRUCTORS(ResourceBundle);
 };
 
 #endif // APP_RESOURCE_BUNDLE_H_