chore: bump chromium to 140.0.7312.0 (38-x-y) (#47881)
* chore: bump chromium in DEPS to 140.0.7312.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * 6769540: Move NetworkTrafficAnnotationTag out of PreconnectManager. Refs https://chromium-review.googlesource.com/c/chromium/src/+/6769540 Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * 6771377: Roll libc++ from 3eda1e62e799 to 569aa83b4bbc (7 revisions) Refs https://chromium-review.googlesource.com/c/chromium/src/+/6771377 Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * 6771398: Remove unnecessary std::optional wrappers in ResolveHostClient Refs https://chromium-review.googlesource.com/c/chromium/src/+/6771398 Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * chore: update patches Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * 6776165: Use shared session bus for MPRIS Refs https://chromium-review.googlesource.com/c/chromium/src/+/6776165 Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * chore: update patches --------- Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: David Sanders <dsanders11@ucsbalum.com> Co-authored-by: patchup[bot] <73610968+patchup[bot]@users.noreply.github.com>
This commit is contained in:
parent
83373c3679
commit
edccb0a7ea
24 changed files with 67 additions and 82 deletions
|
@ -33,7 +33,7 @@ index 0ab8187b0db8ae6db46d81738f653a2bc4c566f6..de3d55e85c22317f7f9375eb94d0d5d4
|
|||
|
||||
} // namespace net
|
||||
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
|
||||
index 4358fcc3dd45e6801b034b21c4ff29144501b719..09f80b28b68a47aec778183d46f1e847649b241b 100644
|
||||
index 3f62466413bf1df98ecbd70633123d7c652a61dc..2cbc92cab0bf5affbc1f655d96b805dcaf670150 100644
|
||||
--- a/services/network/network_context.cc
|
||||
+++ b/services/network/network_context.cc
|
||||
@@ -1872,6 +1872,13 @@ void NetworkContext::SetNetworkConditions(
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue