chore: bump chromium to 140.0.7339.2 (38-x-y) (#47985)
chore: bump chromium to 140.0.7339.2 (main) (#47929) * chore: bump chromium in DEPS to 140.0.7330.0 * chore: bump chromium in DEPS to 140.0.7331.0 * chore: update patches * fix: gn check failing on crashpad.h Not yet sure what caused this * fix: predictors::PreconnectManager -> content::PreconnectManager CL: https://chromium-review.googlesource.com/c/chromium/src/+/6788473 * chore: bump chromium in DEPS to 140.0.7333.0 * chore: bump chromium in DEPS to 140.0.7335.0 * chore: bump chromium in DEPS to 140.0.7337.0 * chore: update patches * chore: restore some gin utility * 6804057: [Extensions] Validate nodoc is specified as a boolean in schemas https://chromium-review.googlesource.com/c/chromium/src/+/6804057 * fixup! chore: restore some gin utility * fixup! fix: predictors::PreconnectManager -> content::PreconnectManager CL: https://chromium-review.googlesource.com/c/chromium/src/+/6788473 * 6772346: Reset MouseWheelPhaseHandler state when trackpoint scroll is detected https://chromium-review.googlesource.com/c/chromium/src/+/6772346 Not certain about what the "correct" argument to pass here is. A quick dive into the CL suggests that passing `false` is safe to keep things working. The blast radius if this assumption is wrong is that "fling" scroll gestures may not work as expected with the OSR. * 6789383: Uninstall SODA language pack after 30 days of inactivity https://chromium-review.googlesource.com/c/chromium/src/+/6789383 * chore: update libcxx filenames * chore: bump chromium in DEPS to 140.0.7339.0 * chore: update patches * fixup! 6772346: Reset MouseWheelPhaseHandler state when trackpoint scroll is detected https://chromium-review.googlesource.com/c/chromium/src/+/6772346 * chore: bump chromium in DEPS to 140.0.7339.2 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Samuel Maddock <smaddock@slack-corp.com> Co-authored-by: deepak1556 <hop2deep@gmail.com>
This commit is contained in:
parent
35b3d25ee1
commit
095ae30f6d
60 changed files with 392 additions and 218 deletions
|
@ -19,7 +19,6 @@
|
|||
#include "base/strings/escape.h"
|
||||
#include "base/strings/string_number_conversions.h"
|
||||
#include "base/strings/string_util.h"
|
||||
#include "chrome/browser/predictors/preconnect_manager.h"
|
||||
#include "chrome/common/chrome_paths.h"
|
||||
#include "chrome/common/pref_names.h"
|
||||
#include "components/keyed_service/content/browser_context_dependency_manager.h"
|
||||
|
@ -34,6 +33,7 @@
|
|||
#include "content/public/browser/browser_thread.h"
|
||||
#include "content/public/browser/cors_origin_pattern_setter.h"
|
||||
#include "content/public/browser/host_zoom_map.h"
|
||||
#include "content/public/browser/preconnect_manager.h"
|
||||
#include "content/public/browser/render_process_host.h"
|
||||
#include "content/public/browser/shared_cors_origin_access_list.h"
|
||||
#include "content/public/browser/storage_partition.h"
|
||||
|
@ -558,11 +558,11 @@ std::string ElectronBrowserContext::GetUserAgent() const {
|
|||
return user_agent_.value_or(ElectronBrowserClient::Get()->GetUserAgent());
|
||||
}
|
||||
|
||||
predictors::PreconnectManager* ElectronBrowserContext::GetPreconnectManager() {
|
||||
content::PreconnectManager* ElectronBrowserContext::GetPreconnectManager() {
|
||||
if (!preconnect_manager_) {
|
||||
preconnect_manager_delegate_ =
|
||||
std::make_unique<ElectronPreconnectManagerDelegate>();
|
||||
preconnect_manager_ = predictors::PreconnectManager::Create(
|
||||
preconnect_manager_ = content::PreconnectManager::Create(
|
||||
preconnect_manager_delegate_->GetWeakPtr(), this);
|
||||
}
|
||||
return preconnect_manager_.get();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue