Thorium_Archive/thorium
1
0
Fork 0
Code Issues 207 Pull requests 3 Projects Releases 53 Packages Wiki Activity

Update shell_main_delegate.cc

Browse source
This commit is contained in:
Alexander David Frick 2022-06-03 23:08:56 -07:00 committed by GitHub
parent 03f71ec2b7
commit f141cd1a4f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
content/shell/app/shell_main_delegate.cc
View file

@ -186,8 +186,8 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
return false; return false;
} }
bool ShellMainDelegate::ShouldCreateFeatureList() { bool ShellMainDelegate::ShouldCreateFeatureList(InvokedIn invoked_in) {
return false; return invoked_in == InvokedIn::kChildProcess;
} }
void ShellMainDelegate::PreSandboxStartup() { void ShellMainDelegate::PreSandboxStartup() {
@ -335,10 +335,12 @@ void ShellMainDelegate::PreBrowserMain() {
#endif #endif
} }
void ShellMainDelegate::PostEarlyInitialization(bool is_running_tests) { void ShellMainDelegate::PostEarlyInitialization(InvokedIn invoked_in) {
// Apply field trial testing configuration. if (!ShouldCreateFeatureList(invoked_in)) {
// Apply field trial testing configuration since content did not.
browser_client_->CreateFeatureListAndFieldTrials(); browser_client_->CreateFeatureListAndFieldTrials();
} }
}
ContentClient* ShellMainDelegate::CreateContentClient() { ContentClient* ShellMainDelegate::CreateContentClient() {
content_client_ = std::make_unique<ShellContentClient>(); content_client_ = std::make_unique<ShellContentClient>();