Update to Chromium version 123.0.6312.0 (#1262506)

- MacOS ARM64 Official builds are currently failing due to
  https://issues.chromium.org/issues/326898585
This commit is contained in:
Marshall Greenblatt
2024-02-22 13:36:15 -05:00
parent 2c5dd120c7
commit d4cf19db29
100 changed files with 837 additions and 799 deletions

View File

@ -1,9 +1,9 @@
diff --git chrome/browser/ui/startup/startup_browser_creator.cc chrome/browser/ui/startup/startup_browser_creator.cc
index ef53c8296d9af..659e077436bbe 100644
index 3e2443d87a998..d751e0ad7c905 100644
--- chrome/browser/ui/startup/startup_browser_creator.cc
+++ chrome/browser/ui/startup/startup_browser_creator.cc
@@ -580,6 +580,14 @@ void OpenNewWindowForFirstRun(
is_first_run, std::move(launch_mode_recorder));
@@ -581,6 +581,14 @@ void OpenNewWindowForFirstRun(
/*restore_tabbed_browser=*/true);
}
#endif // BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(ENABLE_DICE_SUPPORT)
+
@ -17,7 +17,7 @@ index ef53c8296d9af..659e077436bbe 100644
} // namespace
StartupProfileMode StartupProfileModeFromReason(
@@ -1452,6 +1460,12 @@ void StartupBrowserCreator::ProcessCommandLineWithProfile(
@@ -1457,6 +1465,12 @@ void StartupBrowserCreator::ProcessCommandLineWithProfile(
{profile, mode}, last_opened_profiles);
}
@ -30,7 +30,7 @@ index ef53c8296d9af..659e077436bbe 100644
// static
void StartupBrowserCreator::ProcessCommandLineAlreadyRunning(
const base::CommandLine& command_line,
@@ -1461,6 +1475,11 @@ void StartupBrowserCreator::ProcessCommandLineAlreadyRunning(
@@ -1466,6 +1480,11 @@ void StartupBrowserCreator::ProcessCommandLineAlreadyRunning(
return;
}
@ -43,7 +43,7 @@ index ef53c8296d9af..659e077436bbe 100644
StartupProfileMode mode =
StartupProfileModeFromReason(profile_path_info.reason);
diff --git chrome/browser/ui/startup/startup_browser_creator.h chrome/browser/ui/startup/startup_browser_creator.h
index 5e961db0d6f21..f0c065b16d9f0 100644
index 7ce113b2d3436..4d17c36beebd4 100644
--- chrome/browser/ui/startup/startup_browser_creator.h
+++ chrome/browser/ui/startup/startup_browser_creator.h
@@ -9,6 +9,7 @@