mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix assertion in InitializeICU on launch

Browse source 
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
This commit is contained in:
Adam Roben 2014-06-26 16:35:27 -04:00
parent 8e7fbd604c
commit 9602a9aed9
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
brightray/common/main_delegate.cc
View file

@ -27,14 +27,14 @@ scoped_ptr<ContentClient> MainDelegate::CreateContentClient() {
bool MainDelegate::BasicStartupComplete(int* exit_code) { bool MainDelegate::BasicStartupComplete(int* exit_code) {
content_client_ = CreateContentClient().Pass(); content_client_ = CreateContentClient().Pass();
SetContentClient(content_client_.get()); SetContentClient(content_client_.get());
return false;
}
void MainDelegate::PreSandboxStartup() {
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
OverrideChildProcessPath(); OverrideChildProcessPath();
OverrideFrameworkBundlePath(); OverrideFrameworkBundlePath();
#endif #endif
return false;
}
void MainDelegate::PreSandboxStartup() {
InitializeResourceBundle(); InitializeResourceBundle();
} }