Index: ui/base/resource/resource_bundle_dummy.cc |
=================================================================== |
--- ui/base/resource/resource_bundle_dummy.cc (revision 92373) |
+++ ui/base/resource/resource_bundle_dummy.cc (working copy) |
@@ -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(); |
+class Font {}; |
} |
-PlatformFontWin::HFontRef::~HFontRef() { |
- NOTREACHED(); |
-} |
-} |
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 @@ |
return std::string(); |
} |
-/* static */ |
+// static |
void ResourceBundle::CleanupSharedInstance() { |
if (g_shared_instance_) { |
delete g_shared_instance_; |
@@ -43,7 +36,7 @@ |
} |
} |
-/* static */ |
+// static |
ResourceBundle& ResourceBundle::GetSharedInstance() { |
// Must call InitSharedInstance before this function. |
CHECK(g_shared_instance_ != NULL); |