summaryrefslogtreecommitdiffstats
path: root/base/native_library_mac.mm
diff options
context:
space:
mode:
authorstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-28 16:08:09 +0000
committerstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-28 16:08:09 +0000
commitd8921c432923fd6bdbbc176110258c2e3416eaa7 (patch)
treeb31e3e5cbcad38cf3ac64df613881208aa8b658c /base/native_library_mac.mm
parente75f8cb0110ea03d30c31938a1bf7ba489bebeaa (diff)
downloadchromium_src-d8921c432923fd6bdbbc176110258c2e3416eaa7.zip
chromium_src-d8921c432923fd6bdbbc176110258c2e3416eaa7.tar.gz
chromium_src-d8921c432923fd6bdbbc176110258c2e3416eaa7.tar.bz2
Load bundle resources when loading bundles on the Mac
BUG=32208 TEST=Right-click on a QuickTime movie; a context menu should come up. Review URL: http://codereview.chromium.org/551181 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37408 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/native_library_mac.mm')
-rw-r--r--base/native_library_mac.mm8
1 files changed, 6 insertions, 2 deletions
diff --git a/base/native_library_mac.mm b/base/native_library_mac.mm
index 63ac9df..8aaeeb1 100644
--- a/base/native_library_mac.mm
+++ b/base/native_library_mac.mm
@@ -40,15 +40,19 @@ NativeLibrary LoadNativeLibrary(const FilePath& library_path) {
NativeLibrary native_lib = new NativeLibraryStruct();
native_lib->type = BUNDLE;
native_lib->bundle = bundle;
+ native_lib->bundle_resource_ref = CFBundleOpenBundleResourceMap(bundle);
return native_lib;
}
// static
void UnloadNativeLibrary(NativeLibrary library) {
- if (library->type == BUNDLE)
+ if (library->type == BUNDLE) {
+ CFBundleCloseBundleResourceMap(library->bundle,
+ library->bundle_resource_ref);
CFRelease(library->bundle);
- else
+ } else {
dlclose(library->dylib);
+ }
delete library;
}