summaryrefslogtreecommitdiffstats
path: root/chrome/app/chrome_dll_main.cc
diff options
context:
space:
mode:
authormark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-07 16:42:16 +0000
committermark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-07 16:42:16 +0000
commite4221ad535d561b931bd900db9278825adf36b06 (patch)
tree5ca7bef32977d76773f975d13a34c11dd86eab04 /chrome/app/chrome_dll_main.cc
parent9997409a1d70d0f44936ce49227520406b543c6d (diff)
downloadchromium_src-e4221ad535d561b931bd900db9278825adf36b06.zip
chromium_src-e4221ad535d561b931bd900db9278825adf36b06.tar.gz
chromium_src-e4221ad535d561b931bd900db9278825adf36b06.tar.bz2
Move all resources into the framework.
BUG=14610 (in support of unbreaking auto-update) TEST=The .app's Contents/Resources folder should not contain the resources that are moving to the .framework's Resources folder; The .app's Contents/Resources folder should still contain app.icns, document.icns, the helper .app, and a whole slew of .lprojs that only contain InfoPlist.strings; Make sure Breakpad still works in the browser, renderer, and other process types. Review URL: http://codereview.chromium.org/256062 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28262 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/chrome_dll_main.cc')
-rw-r--r--chrome/app/chrome_dll_main.cc7
1 files changed, 1 insertions, 6 deletions
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc
index 02f5b36..4422027 100644
--- a/chrome/app/chrome_dll_main.cc
+++ b/chrome/app/chrome_dll_main.cc
@@ -354,12 +354,7 @@ int ChromeMain(int argc, char** argv) {
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);
- }
+ mac_util::SetOverrideAppBundle(chrome::GetFrameworkBundle());
#endif // OS_MACOSX
#if defined(OS_WIN)