Skip to content

Commit

Permalink
Patches for 120.0.6099.230
Browse files Browse the repository at this point in the history
  • Loading branch information
uazo committed Jan 17, 2024
1 parent a84f833 commit 068d09a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 16 deletions.
14 changes: 1 addition & 13 deletions build/patches/00WIN-Disable-updater.patch
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@ Subject: WIN Disable updater

---
chrome/browser/active_use_util.h | 2 +-
.../browser_process_platform_part_win.cc | 1 +
chrome/browser/updater/BUILD.gn | 9 -----
.../browser/updater/browser_updater_client.cc | 33 +------------------
4 files changed, 3 insertions(+), 42 deletions(-)
3 files changed, 2 insertions(+), 42 deletions(-)

diff --git a/chrome/browser/active_use_util.h b/chrome/browser/active_use_util.h
--- a/chrome/browser/active_use_util.h
Expand All @@ -20,17 +19,6 @@ diff --git a/chrome/browser/active_use_util.h b/chrome/browser/active_use_util.h
+ false;

#endif // CHROME_BROWSER_ACTIVE_USE_UTIL_H_
diff --git a/chrome/browser/browser_process_platform_part_win.cc b/chrome/browser/browser_process_platform_part_win.cc
--- a/chrome/browser/browser_process_platform_part_win.cc
+++ b/chrome/browser/browser_process_platform_part_win.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/browser_process_platform_part_win.h"

#include "chrome/browser/active_use_util.h"
+#include "chrome/install_static/buildflags.h"

BrowserProcessPlatformPart::BrowserProcessPlatformPart() = default;
BrowserProcessPlatformPart::~BrowserProcessPlatformPart() = default;
diff --git a/chrome/browser/updater/BUILD.gn b/chrome/browser/updater/BUILD.gn
--- a/chrome/browser/updater/BUILD.gn
+++ b/chrome/browser/updater/BUILD.gn
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"//chrome/browser/headless",
"//chrome/browser/profiles",
"//chrome/common",
@@ -7792,8 +7786,6 @@ static_library("browser") {
@@ -7790,8 +7784,6 @@ static_library("browser") {
"supervised_user/kids_chrome_management/kids_chrome_management_client_factory.h",
"supervised_user/supervised_user_browser_utils.cc",
"supervised_user/supervised_user_browser_utils.h",
Expand Down Expand Up @@ -173,7 +173,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -511,11 +511,6 @@ void ProcessSingletonNotificationCallbackImpl(
@@ -509,11 +509,6 @@ void ProcessSingletonNotificationCallbackImpl(

StartupBrowserCreator::ProcessCommandLineAlreadyRunning(
command_line, current_directory, startup_profile_path_info);
Expand All @@ -185,7 +185,7 @@ diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_brows
}
#endif // BUILDFLAG(ENABLE_PROCESS_SINGLETON)

@@ -1737,11 +1732,6 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
@@ -1735,11 +1730,6 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
upgrade_util::SaveLastModifiedTimeOfExe();
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)

Expand Down

0 comments on commit 068d09a

Please sign in to comment.