summaryrefslogtreecommitdiffstats
path: root/chrome/app/chrome_dll_main.cc
diff options
context:
space:
mode:
authorthomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-24 16:43:04 +0000
committerthomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-24 16:43:04 +0000
commita2126d5e54f773947d5a400f0caec33f4ea1d930 (patch)
tree81d026b3318923cae14fe25f6fb539f90e672a18 /chrome/app/chrome_dll_main.cc
parent90a99dc148bd74520db74fbc80fa3d8639e2d40f (diff)
downloadchromium_src-a2126d5e54f773947d5a400f0caec33f4ea1d930.zip
chromium_src-a2126d5e54f773947d5a400f0caec33f4ea1d930.tar.gz
chromium_src-a2126d5e54f773947d5a400f0caec33f4ea1d930.tar.bz2
Tweak the comment in the lproj fixup script to explain why we need an "en" folder.
Added a string for the products short name, this is current mac only, and is used for the application menu title via the infoplist.strings file. Added source for a tool to build InfoPlist.strings files based on the values within the GRD files. Run the InfoPlist.strings generation tool during the build. Added a script to take a string and list of locale and generate all the versions of the string. Wired up the string locale tool so GYP knows about all the inputs/outputs from the InfoPlist.strings generation tool. Stop setting some of the Info.plist keys that are now covered by the InfoPlist.strings files. Update the mac links script to stop creating a resources link. Add a shim to nuke the helper's resource link so it can get a real folder. Helper in in chrome_paths_mac to find the main app's bundle (that the helper lives in). At startup, if not the browser, set the main bundle to be the parent of this bundle. Fix up the breakpad init to use the mac_util helper for main bundle. TEST=when runnining in the supported languages, Finder Get Info should show a localized copyright. The process names in activity monitor should also be correct and show localized names once the TC work is done. BUG=19019 Review URL: http://codereview.chromium.org/171040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24104 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/chrome_dll_main.cc')
-rw-r--r--chrome/app/chrome_dll_main.cc15
1 files changed, 13 insertions, 2 deletions
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc
index d2af7a9..64f5ce53 100644
--- a/chrome/app/chrome_dll_main.cc
+++ b/chrome/app/chrome_dll_main.cc
@@ -49,6 +49,8 @@
#include "base/win_util.h"
#endif
#if defined(OS_MACOSX)
+#include "base/mac_util.h"
+#include "chrome/common/chrome_paths_internal.h"
#include "chrome/app/breakpad_mac.h"
#endif
#if defined(OS_LINUX)
@@ -335,6 +337,17 @@ int ChromeMain(int argc, const char** argv) {
#endif
const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
+ std::wstring process_type =
+ parsed_command_line.GetSwitchValue(switches::kProcessType);
+
+#if defined(OS_MACOSX)
+ // If process_type is not empty, this is the helper. Set the main app bundle
+ // so code can fetch Mac resources.
+ if (!process_type.empty()) {
+ FilePath main_path(chrome::GetBrowserBundlePath());
+ mac_util::SetOverrideAppBundlePath(main_path);
+ }
+#endif // OS_MACOSX
#if defined(OS_WIN)
// Must do this before any other usage of command line!
@@ -373,8 +386,6 @@ int ChromeMain(int argc, const char** argv) {
#endif // OS_POSIX
int browser_pid;
- std::wstring process_type =
- parsed_command_line.GetSwitchValue(switches::kProcessType);
if (process_type.empty()) {
browser_pid = base::GetCurrentProcId();
} else {