8532e1239e
* chore: bump chromium in DEPS to 92.0.4512.6
* 2887336: [CaptureHandle][#2] Propagate CaptureHandleConfig in browser process
https://chromium-review.googlesource.com/c/chromium/src/+/2887336
* refactor: base::Optional -> absl::optional
* chore: fixup patch indices
* chore: bump chromium in DEPS to 92.0.4514.0
* 2899417: Make build work when enable_pdf is set to false.
https://chromium-review.googlesource.com/c/chromium/src/+/2899417
* 2904731: use BrowserContext instead of Profile in PreconnectManager
https://chromium-review.googlesource.com/c/chromium/src/+/2904731
* 2295749: fix: check IsSecureEventInputEnabled in constructor before setting SetPasswordInputEnabled to true
https://chromium-review.googlesource.com/c/chromium/src/+/2295749
* 2893803: Add a GetWebView to RenderFrame.
https://chromium-review.googlesource.com/c/chromium/src/+/2893803
* 2892345: Implement WebContents::ForEachRenderFrameHost
https://chromium-review.googlesource.com/c/chromium/src/+/2892345
* chore: fixup patch indices
* 2892048: Real instance methods for BrowserContext: remaining 5 methods.
https://chromium-review.googlesource.com/c/chromium/src/+/2892048
* 2902821: [mojo] Don't require full header includes for referenced interfaces
https://chromium-review.googlesource.com/c/chromium/src/+/2902821
* 2496500: Remove last deprecated extension Event ctor.
https://chromium-review.googlesource.com/c/chromium/src/+/2496500
* chore: fixup malformed pepper support patch
* chore: bump chromium in DEPS to 92.0.4515.0
* 2908461: Add CreateEmptyPrintPagesParamsPtr() inside print_view_manager_base.cc.
https://chromium-review.googlesource.com/c/chromium/src/+/2908461
* 2880838: viz: add optional HDRMetadata to TransferableResource
https://chromium-review.googlesource.com/c/chromium/src/+/2880838
* chore: fixup patch indices
* chore: bump chromium in DEPS to 92.0.4515.5
* chore: update patches
* chore: bump chromium in DEPS to 92.0.4515.7
* chore: bump chromium in DEPS to 92.0.4515.9
* chore: bump chromium in DEPS to 93.0.4522.0
* chore: bump chromium in DEPS to 93.0.4523.0
* chore: bump chromium in DEPS to 93.0.4524.0
* chore: update patches
* chore: enable_pak_file_integrity_checks was reverted
* chore: update patches
* refactor: base/optional was replaced with absl::optional
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202
* refactor: replace all usages of base::nullopt with absl::nullopt
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202
* chore: add missing base::Contains include
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202
* refactor: replace all usages of base::make_optional with
absl::make_optional
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202
* refactor: replace WorldScriptContext() with GetScriptContextFromWorldId
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2893213
* chore: clean up left over opening namespace
Refs: 95bfe6d08f
* chore: add missing base::Contains include
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202
* refactor: replace GetCurrentDisplayIterator with the hard checker
GetCurrentDisplay
This code looks suspicious but if the iterator was invalid before it
will also be invalid now.
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2893191
* refactor: headers are now passed directly in extensions client
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2918906
* refactor: base::DictionaryValue::empty() has been removed
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2912424
* chore: add missing includes for network URLLoaderFactory
Refs: unknown, probably a side effect of header changes
* refactor: make convenience wrapper around AppendArg
There is no converter FromV8 for base::StringPiece (apparently its not
possible). So we now take in an std::string and use the construct for
StringPiece to do implicit conversion.
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2905544
* chore: add patch
* chore: bump chromium in DEPS to 93.0.4525.0
* chore: update patches
* refactor: CanResize has been de-virtualized
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2485774
* chore: update resource integrity patch
* chore: add character encoding idl patch
* chore: bump chromium in DEPS to 93.0.4526.0
* chore: update patches
* chore: bump chromium in DEPS to 93.0.4527.0
* chore: bump chromium in DEPS to 93.0.4528.0
* chore: update patches
* chore: update idl encoding patch
* chore: bump chromium in DEPS to 93.0.4529.0
* chore: update patches
* chore: bump chromium in DEPS to 93.0.4530.0
* chore: update patches
* fix: only SetCanResize after the widget has been initialized
* chore: add patch for vr on windows gn gen
* spec: fix focus related tests on linux due to delay in focus swap
* chore: remove new usages of base::Optional from main
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: Samuel Attard <sattard@slack-corp.com>
Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
101 lines
3.3 KiB
C++
101 lines
3.3 KiB
C++
// Copyright (c) 2018 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/net/resolve_proxy_helper.h"
|
|
|
|
#include <utility>
|
|
|
|
#include "base/bind.h"
|
|
#include "content/public/browser/browser_thread.h"
|
|
#include "content/public/browser/storage_partition.h"
|
|
#include "mojo/public/cpp/bindings/pending_remote.h"
|
|
#include "net/proxy_resolution/proxy_info.h"
|
|
#include "services/network/public/mojom/network_context.mojom.h"
|
|
#include "shell/browser/electron_browser_context.h"
|
|
|
|
using content::BrowserThread;
|
|
|
|
namespace electron {
|
|
|
|
ResolveProxyHelper::ResolveProxyHelper(ElectronBrowserContext* browser_context)
|
|
: browser_context_(browser_context) {}
|
|
|
|
ResolveProxyHelper::~ResolveProxyHelper() {
|
|
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
|
DCHECK(!owned_self_);
|
|
DCHECK(!receiver_.is_bound());
|
|
// Clear all pending requests if the ProxyService is still alive.
|
|
pending_requests_.clear();
|
|
}
|
|
|
|
void ResolveProxyHelper::ResolveProxy(const GURL& url,
|
|
ResolveProxyCallback callback) {
|
|
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
|
// Enqueue the pending request.
|
|
pending_requests_.emplace_back(url, std::move(callback));
|
|
|
|
// If nothing is in progress, start.
|
|
if (!receiver_.is_bound()) {
|
|
DCHECK_EQ(1u, pending_requests_.size());
|
|
StartPendingRequest();
|
|
}
|
|
}
|
|
|
|
void ResolveProxyHelper::StartPendingRequest() {
|
|
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
|
DCHECK(!receiver_.is_bound());
|
|
DCHECK(!pending_requests_.empty());
|
|
|
|
// Start the request.
|
|
mojo::PendingRemote<network::mojom::ProxyLookupClient> proxy_lookup_client =
|
|
receiver_.BindNewPipeAndPassRemote();
|
|
receiver_.set_disconnect_handler(
|
|
base::BindOnce(&ResolveProxyHelper::OnProxyLookupComplete,
|
|
base::Unretained(this), net::ERR_ABORTED, absl::nullopt));
|
|
browser_context_->GetDefaultStoragePartition()
|
|
->GetNetworkContext()
|
|
->LookUpProxyForURL(pending_requests_.front().url,
|
|
net::NetworkIsolationKey::Todo(),
|
|
std::move(proxy_lookup_client));
|
|
}
|
|
|
|
void ResolveProxyHelper::OnProxyLookupComplete(
|
|
int32_t net_error,
|
|
const absl::optional<net::ProxyInfo>& proxy_info) {
|
|
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
|
DCHECK(!pending_requests_.empty());
|
|
|
|
receiver_.reset();
|
|
|
|
// Clear the current (completed) request.
|
|
PendingRequest completed_request = std::move(pending_requests_.front());
|
|
pending_requests_.pop_front();
|
|
|
|
std::string proxy;
|
|
if (proxy_info)
|
|
proxy = proxy_info->ToPacString();
|
|
|
|
if (!completed_request.callback.is_null())
|
|
std::move(completed_request.callback).Run(proxy);
|
|
|
|
// Start the next request.
|
|
if (!pending_requests_.empty())
|
|
StartPendingRequest();
|
|
}
|
|
|
|
ResolveProxyHelper::PendingRequest::PendingRequest(
|
|
const GURL& url,
|
|
ResolveProxyCallback callback)
|
|
: url(url), callback(std::move(callback)) {}
|
|
|
|
ResolveProxyHelper::PendingRequest::PendingRequest(
|
|
ResolveProxyHelper::PendingRequest&& pending_request) = default;
|
|
|
|
ResolveProxyHelper::PendingRequest::~PendingRequest() noexcept = default;
|
|
|
|
ResolveProxyHelper::PendingRequest&
|
|
ResolveProxyHelper::PendingRequest::operator=(
|
|
ResolveProxyHelper::PendingRequest&& pending_request) noexcept = default;
|
|
|
|
} // namespace electron
|