Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1910)

Unified Diff: chrome/app/chrome_dll_main.cc

Issue 171040: add the InfoPlist.strings generation based on GRD strings.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/app/breakpad_mac.mm ('k') | chrome/app/chromium_strings.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/chrome_dll_main.cc
===================================================================
--- chrome/app/chrome_dll_main.cc (revision 24091)
+++ chrome/app/chrome_dll_main.cc (working copy)
@@ -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,7 +337,18 @@
#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!
if (HasDeprecatedArguments(parsed_command_line.command_line_string()))
@@ -373,8 +386,6 @@
#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 {
« no previous file with comments | « chrome/app/breakpad_mac.mm ('k') | chrome/app/chromium_strings.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698