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

Unified Diff: content/shell/shell_main_delegate.cc

Issue 12470006: mac content shell drt: Don't DLOG(FATAL) during font loading in debug builds (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: space Created 7 years, 9 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 | content/shell/webkit_test_platform_support_mac.mm » ('j') | 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 04ed95da3c6315f55b3e2bcf8be20c969aa51ab1..6dc3fb51fa4e920e987dacb0c7353e5336fe7431 100644
--- a/content/shell/shell_main_delegate.cc
+++ b/content/shell/shell_main_delegate.cc
@@ -94,6 +94,12 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
// Enable trace control and transport through event tracing for Windows.
logging::LogEventProvider::Initialize(kContentShellProviderName);
#endif
+#if defined(OS_MACOSX)
+ // Needs to happen before InitializeResourceBundle() and before
+ // WebKitTestPlatformInitialize() are called.
+ OverrideFrameworkBundlePath();
+ OverrideChildProcessPath();
+#endif // OS_MACOSX
InitLogging();
CommandLine& command_line = *CommandLine::ForCurrentProcess();
@@ -122,10 +128,6 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
}
void ShellMainDelegate::PreSandboxStartup() {
-#if defined(OS_MACOSX)
- OverrideFrameworkBundlePath();
- OverrideChildProcessPath();
-#endif // OS_MACOSX
InitializeResourceBundle();
}
« no previous file with comments | « no previous file | content/shell/webkit_test_platform_support_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698