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-07-21 06:01:11 -05:00 committed by GitHub
parent 5f72142b58
commit 37759db904
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/content/shell/app/shell_main_delegate.cc
View file

@ -134,11 +134,7 @@ ShellMainDelegate::ShellMainDelegate(bool is_content_browsertests)
ShellMainDelegate::~ShellMainDelegate() {
}
bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
int dummy;
if (!exit_code)
exit_code = &dummy;
absl::optional<int> ShellMainDelegate::BasicStartupComplete() {
base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess();
if (command_line.HasSwitch("run-layout-test")) {
std::cerr << std::string(79, '*') << "\n"
@ -184,7 +180,7 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
RegisterShellPathProvider();
return false;
return absl::nullopt;
}
bool ShellMainDelegate::ShouldCreateFeatureList(InvokedIn invoked_in) {
@ -330,17 +326,20 @@ void ShellMainDelegate::InitializeResourceBundle() {
#endif
}
void ShellMainDelegate::PreBrowserMain() {
absl::optional<int> ShellMainDelegate::PreBrowserMain() {
#if BUILDFLAG(IS_MAC)
RegisterShellCrApp();
#endif
return absl::nullopt;
}
void ShellMainDelegate::PostEarlyInitialization(InvokedIn invoked_in) {
absl::optional<int> ShellMainDelegate::PostEarlyInitialization(
InvokedIn invoked_in) {
if (!ShouldCreateFeatureList(invoked_in)) {
// Apply field trial testing configuration since content did not.
browser_client_->CreateFeatureListAndFieldTrials();
}
return absl::nullopt;
}
ContentClient* ShellMainDelegate::CreateContentClient() {