From 9602a9aed9f6c4c10aad8f6689387fa30d00f4f5 Mon Sep 17 00:00:00 2001 From: Adam Roben Date: Thu, 26 Jun 2014 16:35:27 -0400 Subject: [PATCH] Fix assertion in InitializeICU on launch We have to tell Chromium about our framework bundle earlier in the launch sequence so it can find icudtl.dat. See https://codereview.chromium.org/12470006 --- brightray/common/main_delegate.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/brightray/common/main_delegate.cc b/brightray/common/main_delegate.cc index f85c769bafc4..ea0cbdddb5a4 100644 --- a/brightray/common/main_delegate.cc +++ b/brightray/common/main_delegate.cc @@ -27,14 +27,14 @@ scoped_ptr MainDelegate::CreateContentClient() { bool MainDelegate::BasicStartupComplete(int* exit_code) { content_client_ = CreateContentClient().Pass(); SetContentClient(content_client_.get()); - return false; -} - -void MainDelegate::PreSandboxStartup() { #if defined(OS_MACOSX) OverrideChildProcessPath(); OverrideFrameworkBundlePath(); #endif + return false; +} + +void MainDelegate::PreSandboxStartup() { InitializeResourceBundle(); }