summaryrefslogtreecommitdiffstats
path: root/base/mac
diff options
context:
space:
mode:
authorjeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-19 14:59:07 +0000
committerjeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-19 14:59:07 +0000
commit2f1804c7ecc4b4c8bb802dc518db9f3244b57e15 (patch)
tree64584fe049e7b0381f142689eb934dae9eac8ad3 /base/mac
parente8315a4dca1a46363b91af21742bdb5d0eb0ceeb (diff)
downloadchromium_src-2f1804c7ecc4b4c8bb802dc518db9f3244b57e15.zip
chromium_src-2f1804c7ecc4b4c8bb802dc518db9f3244b57e15.tar.gz
chromium_src-2f1804c7ecc4b4c8bb802dc518db9f3244b57e15.tar.bz2
Transition to base/mac/bundle_locations.h step 2
Remove MainAppBundle() in favor of FrameworkBundle() and update all callsites + code comments. BUG=None TEST=Code should compile and all unit tests should pass. Review URL: https://chromiumcodereview.appspot.com/9220005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118293 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/mac')
-rw-r--r--base/mac/foundation_util.h6
-rw-r--r--base/mac/foundation_util.mm8
2 files changed, 0 insertions, 14 deletions
diff --git a/base/mac/foundation_util.h b/base/mac/foundation_util.h
index 580680c..67e41e1 100644
--- a/base/mac/foundation_util.h
+++ b/base/mac/foundation_util.h
@@ -43,12 +43,6 @@ BASE_EXPORT void SetOverrideAmIBundled(bool value);
// Returns true if this process is marked as a "Background only process".
BASE_EXPORT bool IsBackgroundOnlyProcess();
-// Returns the main bundle or the override, used for code that needs
-// to fetch resources from bundles, but work within a unittest where we
-// aren't a bundle.
-BASE_EXPORT NSBundle* MainAppBundle();
-BASE_EXPORT FilePath MainAppBundlePath();
-
// Returns the path to a resource within the framework bundle.
FilePath PathForFrameworkBundleResource(CFStringRef resourceName);
diff --git a/base/mac/foundation_util.mm b/base/mac/foundation_util.mm
index 519af45..6feeaf4 100644
--- a/base/mac/foundation_util.mm
+++ b/base/mac/foundation_util.mm
@@ -68,14 +68,6 @@ bool IsBackgroundOnlyProcess() {
return [[info_dictionary objectForKey:@"LSUIElement"] boolValue] != NO;
}
-NSBundle* MainAppBundle() {
- return base::mac::FrameworkBundle();
-}
-
-FilePath MainAppBundlePath() {
- return base::mac::FrameworkBundlePath();
-}
-
FilePath PathForFrameworkBundleResource(CFStringRef resourceName) {
NSBundle* bundle = base::mac::FrameworkBundle();
NSString* resourcePath = [bundle pathForResource:(NSString*)resourceName