summaryrefslogtreecommitdiffstats
path: root/chrome/app/chrome_main.h
diff options
context:
space:
mode:
authormark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-26 15:39:55 +0000
committermark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-26 15:39:55 +0000
commitadf9eea7f5dff8522bf4bdee064e696911d725f8 (patch)
treedb81934a7d20f092e0a1291ca39ffbea00b16308 /chrome/app/chrome_main.h
parent7fbbe92589720b43dfe8aa3b9c381cff080f8331 (diff)
downloadchromium_src-adf9eea7f5dff8522bf4bdee064e696911d725f8.zip
chromium_src-adf9eea7f5dff8522bf4bdee064e696911d725f8.tar.gz
chromium_src-adf9eea7f5dff8522bf4bdee064e696911d725f8.tar.bz2
Move one more bit of early startup initialization to a function that has its
own NSAutoreleasePool. This closes a minor theoretical leak, but probably has no practical impact. Setting the bundle override now happens before setting the base bundle ID, because technically the base bundle ID depends on the bundle override via its dependency on the versioned directory. Don't worry, it's not really important. BUG=none TEST=none Review URL: http://codereview.chromium.org/6902009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83017 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/chrome_main.h')
-rw-r--r--chrome/app/chrome_main.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/chrome/app/chrome_main.h b/chrome/app/chrome_main.h
index 0ecf06a..518cb7a 100644
--- a/chrome/app/chrome_main.h
+++ b/chrome/app/chrome_main.h
@@ -32,10 +32,12 @@ void LowLevelShutdown();
void CheckUserDataDirPolicy(FilePath* user_data_dir);
#if defined(OS_MACOSX)
-// Sets the base bundle ID to the proper value based on the running
-// application. The base bundle ID is the outer browser application's bundle
-// ID even when running in a non-browser (helper) process.
-void SetUpBaseBundleID();
+// Sets the app bundle (base::mac::MainAppBundle()) to the framework's bundle,
+// and sets the base bundle ID (base::mac::BaseBundleID()) to the proper value
+// based on the running application. The base bundle ID is the outer browser
+// application's bundle ID even when running in a non-browser (helper)
+// process.
+void SetUpBundleOverrides();
#endif
} // namespace chrome_main