Functions to return locations of various Chrome bundles.

base/mac/bundle_locations.mm

Index: base/mac/bundle_locations.mm
diff --git a/base/mac/bundle_locations.mm b/base/mac/bundle_locations.mm
new file mode 100644
index 0000000000000000000000000000000000000000..922be7cf24e8da8b53d42d262e186205a9b7ce83
--- /dev/null
+++ b/base/mac/bundle_locations.mm
@@ -0,0 +1,64 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "base/mac/bundle_locations.h"
+
+namespace base {
+namespace mac {
+
+// No threading worries since NSBundle isn't thread safe.

[Avi (use Gerrit), 2012/01/10 15:37:13]

Why do I find this sentence funny? :) Is it worth checking the calling thread in
DCHECKs?

Do scoped_nsobjects have evil static initializers? Can we use them here?

[Mark Mentovai, 2012/01/10 22:09:35]

Avi wrote:
Nope, they’ve still got destructors.

[jeremy, 2012/01/11 07:12:44]

This comment is copied from foundation_utils.h , I've added DCHECKs in all of
the relevant functions - does that seem ok to you?

[Avi (use Gerrit), 2012/01/11 14:44:22]

Oh, that's fine. It struck me as absurd that there are no threading concerns
because something is thread un-safe. I know what you mean, but still...

+static NSBundle* g_override_launch_bundle = nil;
+static NSBundle* g_override_framework_bundle = nil;
+static NSBundle* g_override_outer_bundle = nil;
+
+NSBundle* LaunchBundle() {

[Mark Mentovai, 2012/01/10 22:09:35]

This name sounds like it’s going to launch a bundle.

[jeremy, 2012/01/11 07:12:44]

Yes it does, changing to MainBundle() - other suggestions welcome :)

+  if (g_override_launch_bundle)
+    return g_override_launch_bundle;
+  return [NSBundle mainBundle];
+}
+
+FilePath LaunchBundleBundlePath() {

[Mark Mentovai, 2012/01/10 22:09:35]

This name sounds like you’re stuttering.

[jeremy, 2012/01/11 07:12:44]

Done.

+  NSBundle* bundle = LaunchBundle();
+  return FilePath([[bundle bundlePath] fileSystemRepresentation]);
+}
+
+NSBundle* OuterBundle() {
+  if (g_override_outer_bundle)
+    return g_override_outer_bundle;
+  return [NSBundle mainBundle];
+}
+
+FilePath OuterBundlePath() {
+  NSBundle* bundle = OuterBundle();
+  return FilePath([[bundle bundlePath] fileSystemRepresentation]);
+}
+
+NSBundle* FrameworkBundle() {

[Mark Mentovai, 2012/01/10 22:09:35]

If we have convenience wrappers for the other two calls (launch-bundle and
outer-bundle) to get their FilePaths, why isn’t there one for this? Does nobody
ever want the framework bundle’s FilePath?

[jeremy, 2012/01/11 07:12:44]

Done.

+  if (g_override_framework_bundle)
+    return g_override_framework_bundle;
+  return [NSBundle mainBundle];
+}
+
+static void AssignOverrideBundle(NSBundle* new_bundle,
+                                 NSBundle* override_bundle) {
+  if (new_bundle != override_bundle) {
+    [override_bundle release];
+    override_bundle = [new_bundle retain];
+  }
+}
+
+void SetOverrideLaunchBundle(NSBundle* bundle) {
+  AssignOverrideBundle(bundle, g_override_launch_bundle);
+}
+
+void SetOverrideFrameworkBundle(NSBundle* bundle) {
+  AssignOverrideBundle(bundle, g_override_framework_bundle);
+}
+
+void SetOverrideOuterBundle(NSBundle* bundle) {
+  AssignOverrideBundle(bundle, g_override_outer_bundle);
+}
+
+}  // namespace mac
+}  // namespace base