summaryrefslogtreecommitdiffstats
path: root/chrome/common/resource_bundle.h
diff options
context:
space:
mode:
authorthomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-26 12:41:40 +0000
committerthomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-26 12:41:40 +0000
commit4b0d2dd2046099d9602aa256bde12a6634afcca5 (patch)
treeb958bf27de5ce5fc0299e1e8671251ff92ad39d0 /chrome/common/resource_bundle.h
parentb2abac7f32280c9d8bd0fd0d23c5432701634807 (diff)
downloadchromium_src-4b0d2dd2046099d9602aa256bde12a6634afcca5.zip
chromium_src-4b0d2dd2046099d9602aa256bde12a6634afcca5.tar.gz
chromium_src-4b0d2dd2046099d9602aa256bde12a6634afcca5.tar.bz2
Wire up resource bundles on the mac:
- compile resource_bundle - add resource_bundle_mac by cloning the linux and using some NSBundle to find the files. - enable resource bundles on the mac in the calling code. - added script to app target to repack .pak files into larger chunks (chrome, theme, and localized bits). - added script to copy repacked files into the app bundle. Review URL: http://codereview.chromium.org/28171 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10460 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/resource_bundle.h')
-rw-r--r--chrome/common/resource_bundle.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/common/resource_bundle.h b/chrome/common/resource_bundle.h
index 983f34b..ac62d9b 100644
--- a/chrome/common/resource_bundle.h
+++ b/chrome/common/resource_bundle.h
@@ -19,10 +19,12 @@
#include "base/lock.h"
#include "base/scoped_ptr.h"
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_MACOSX)
namespace base {
class DataPack;
};
+#endif
+#if defined(OS_LINUX)
typedef struct _GdkPixbuf GdkPixbuf;
#endif
class ChromeFont;
@@ -48,6 +50,8 @@ class ResourceBundle {
};
// Initialize the ResourceBundle for this process.
+ // NOTE: Mac ignores this and always loads up resources for the language
+ // defined by the Cocoa UI (ie-NSBundle does the langange work).
static void InitSharedInstance(const std::wstring& pref_locale);
// Delete the ResourceBundle for this process if it exists.
@@ -120,12 +124,9 @@ class ResourceBundle {
#if defined(OS_WIN)
// Windows stores resources in DLLs, which are managed by HINSTANCE.
typedef HINSTANCE DataHandle;
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_MACOSX)
// Linux uses base::DataPack.
typedef base::DataPack* DataHandle;
-#elif defined(OS_MACOSX)
- // TODO(port): Implement resource loading on OS X.
- typedef void* DataHandle;
#endif
// Ctor/dtor are private, since we're a singleton.