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

Unified Diff: content/shell/shell_main_delegate.cc

Issue 10843003: Override the framework path in PreSandboxStartup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/shell_main_delegate.cc
diff --git a/content/shell/shell_main_delegate.cc b/content/shell/shell_main_delegate.cc
index 5d578d5f4969e2f93dcaccbf7fedd54211e2c4c3..5326a4a3f84bf0faadbe73f2edeef529681fa614 100644
--- a/content/shell/shell_main_delegate.cc
+++ b/content/shell/shell_main_delegate.cc
@@ -61,15 +61,13 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kAllowFileAccessFromFiles);
}
-#if defined(OS_MACOSX)
- OverrideFrameworkBundlePath();
-#endif
SetContentClient(&content_client_);
return false;
}
void ShellMainDelegate::PreSandboxStartup() {
#if defined(OS_MACOSX)
+ OverrideFrameworkBundlePath();
Avi (use Gerrit) 2012/07/31 14:54:58 Note that the location of this call was mirroring
jochen (gone - plz use gerrit) 2012/07/31 14:59:26 I don't know why it's called there. The problem i
OverrideChildProcessPath();
#endif // OS_MACOSX
InitializeResourceBundle();
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698