Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(379)

Unified Diff: ui/base/resource/resource_bundle_dummy.cc

Issue 7344022: Add COMPONENT_BUILD global define. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sandbox/sandbox.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « sandbox/sandbox.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698