Update to Chromium version 117.0.5895.0 (#1171312)

This commit is contained in:
Marshall Greenblatt
2023-07-20 18:11:34 -04:00
parent 1353677a98
commit 8b46735b79
78 changed files with 489 additions and 476 deletions

View File

@ -1,5 +1,5 @@
diff --git chrome/browser/net/proxy_config_monitor.cc chrome/browser/net/proxy_config_monitor.cc
index 6dc5622f50847..89d36c8485e7e 100644
index c9281f7abfbde..a1b7c77475b54 100644
--- chrome/browser/net/proxy_config_monitor.cc
+++ chrome/browser/net/proxy_config_monitor.cc
@@ -9,6 +9,7 @@
@ -10,7 +10,7 @@ index 6dc5622f50847..89d36c8485e7e 100644
#include "chrome/browser/browser_process.h"
#include "chrome/browser/net/proxy_service_factory.h"
#include "chrome/browser/profiles/profile.h"
@@ -22,6 +23,10 @@
@@ -21,6 +22,10 @@
#include "chrome/browser/ash/profiles/profile_helper.h"
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -21,7 +21,7 @@ index 6dc5622f50847..89d36c8485e7e 100644
#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "chrome/browser/extensions/api/proxy/proxy_api.h"
#endif
@@ -95,6 +100,9 @@ void ProxyConfigMonitor::AddToNetworkContextParams(
@@ -92,6 +97,9 @@ void ProxyConfigMonitor::AddToNetworkContextParams(
}
#if BUILDFLAG(ENABLE_EXTENSIONS)