summaryrefslogtreecommitdiffstats
path: root/app/resource_bundle_dummy.cc
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-13 16:43:03 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-13 16:43:03 +0000
commitc6ac841f51c0b884b38e917ac30b1dfde0dc43a7 (patch)
tree2b490ffa6795f72e7232d658b766785f0de64e38 /app/resource_bundle_dummy.cc
parent6b32b95cff99ee72fd7824237ae5070263e5c496 (diff)
downloadchromium_src-c6ac841f51c0b884b38e917ac30b1dfde0dc43a7.zip
chromium_src-c6ac841f51c0b884b38e917ac30b1dfde0dc43a7.tar.gz
chromium_src-c6ac841f51c0b884b38e917ac30b1dfde0dc43a7.tar.bz2
Rework gfx::Font by moving platform-specific code into inner classes.
gfx::Font is a platform-neutral API shim that exists as a wrapper object to allow for the creation and lifetime of gfx::Font objects to remain consistent with past usage. gfx::PlatformFont is an interface implemented by the platform-specific inner classes (gfx::PlatformFontWin,Mac,Gtk). BUG=none TEST=existing unittests Review URL: http://codereview.chromium.org/3083022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56040 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/resource_bundle_dummy.cc')
-rw-r--r--app/resource_bundle_dummy.cc10
1 files changed, 7 insertions, 3 deletions
diff --git a/app/resource_bundle_dummy.cc b/app/resource_bundle_dummy.cc
index 9a22afd..e93df01 100644
--- a/app/resource_bundle_dummy.cc
+++ b/app/resource_bundle_dummy.cc
@@ -9,6 +9,7 @@
#include "base/lock.h"
#include "base/logging.h"
#include "gfx/font.h"
+#include "gfx/platform_font_win.h"
ResourceBundle* ResourceBundle::g_shared_instance_ = NULL;
@@ -16,9 +17,12 @@ ResourceBundle* ResourceBundle::g_shared_instance_ = NULL;
// files. The font members of ResourceBundle are never initialized in our code
// so this destructor is never called.
namespace gfx {
- Font::HFontRef::~HFontRef() {
- NOTREACHED();
- }
+Font::~Font() {
+ NOTREACHED();
+}
+PlatformFontWin::HFontRef::~HFontRef() {
+ NOTREACHED();
+}
}