diff options
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/base/resource/resource_bundle_dummy.cc | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/ui/base/resource/resource_bundle_dummy.cc b/ui/base/resource/resource_bundle_dummy.cc index 82afaab..0dbf1f1 100644 --- a/ui/base/resource/resource_bundle_dummy.cc +++ b/ui/base/resource/resource_bundle_dummy.cc @@ -8,26 +8,19 @@ #include "base/logging.h" #include "base/synchronization/lock.h" -#include "ui/gfx/font.h" -#include "ui/gfx/platform_font_win.h" // NOTE(gregoryd): This is a hack to avoid creating more nacl_win64-specific // files. The font members of ResourceBundle are never initialized in our code -// so this destructor is never called. +// so we can get away with an empty class definition. namespace gfx { -Font::~Font() { - NOTREACHED(); -} -PlatformFontWin::HFontRef::~HFontRef() { - NOTREACHED(); -} +class Font {}; } namespace ui { ResourceBundle* ResourceBundle::g_shared_instance_ = NULL; -/* static */ +// static std::string ResourceBundle::InitSharedInstance( const std::string& pref_locale) { DCHECK(g_shared_instance_ == NULL) << "ResourceBundle initialized twice"; @@ -35,7 +28,7 @@ std::string ResourceBundle::InitSharedInstance( return std::string(); } -/* static */ +// static void ResourceBundle::CleanupSharedInstance() { if (g_shared_instance_) { delete g_shared_instance_; @@ -43,7 +36,7 @@ void ResourceBundle::CleanupSharedInstance() { } } -/* static */ +// static ResourceBundle& ResourceBundle::GetSharedInstance() { // Must call InitSharedInstance before this function. CHECK(g_shared_instance_ != NULL); |