summaryrefslogtreecommitdiffstats
path: root/chrome/app
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/app
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/app')
-rw-r--r--chrome/app/chrome_dll_main.cc6
1 files changed, 0 insertions, 6 deletions
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc
index 3a94bb5..daf5244 100644
--- a/chrome/app/chrome_dll_main.cc
+++ b/chrome/app/chrome_dll_main.cc
@@ -169,13 +169,10 @@ void EnableHeapProfiler(const CommandLine& parsed_command_line) {
}
void CommonSubprocessInit() {
-#if defined(OS_WIN) || defined(OS_LINUX)
// Initialize ResourceBundle which handles files loaded from external
// sources. The language should have been passed in to us from the
// browser process as a command line flag.
- // TODO(port-mac): enable when we figure out resource bundle issues
ResourceBundle::InitSharedInstance(std::wstring());
-#endif
#if defined(OS_WIN)
// HACK: Let Windows know that we have started. This is needed to suppress
@@ -330,10 +327,7 @@ int ChromeMain(int argc, const char** argv) {
}
if (!process_type.empty()) {
-#if defined(OS_WIN) || defined(OS_LINUX)
- // TODO(port-mac): enable when we figure out resource bundle issues
ResourceBundle::CleanupSharedInstance();
-#endif
}
#if defined(OS_WIN)