mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2024-12-12 09:37:37 +01:00
047e8f9349
- Building on macOS now requires the 10.15 SDK. Xcode 11.3 is recommended as Xcode 11.4 is not currently supported (see https://crbug.com/1065146). - Jumbo build configuration is no longer supported. Chromium is skipping the M82 release and consequently no CEF 4085 branch will be created. For details on the Chromium decision see https://groups.google.com/a/chromium.org/d/msg/chromium-dev/Vn7uzglqLz0/JItlSrZxBAAJ
53 lines
2.0 KiB
Diff
53 lines
2.0 KiB
Diff
diff --git content/browser/storage_partition_impl.cc content/browser/storage_partition_impl.cc
|
|
index e76b66dace82..94a5f80a9b42 100644
|
|
--- content/browser/storage_partition_impl.cc
|
|
+++ content/browser/storage_partition_impl.cc
|
|
@@ -780,10 +780,6 @@ class LoginHandlerDelegate {
|
|
}
|
|
|
|
WebContents* web_contents = web_contents_getter_.Run();
|
|
- if (!web_contents) {
|
|
- OnAuthCredentials(base::nullopt);
|
|
- return;
|
|
- }
|
|
|
|
// WeakPtr is not strictly necessary here due to OnRequestCancelled.
|
|
creating_login_delegate_ = true;
|
|
@@ -840,12 +836,6 @@ void OnAuthRequiredContinuation(
|
|
web_contents_getter =
|
|
base::BindRepeating(GetWebContents, process_id, routing_id);
|
|
}
|
|
- if (!web_contents_getter.Run()) {
|
|
- mojo::Remote<network::mojom::AuthChallengeResponder>
|
|
- auth_challenge_responder_remote(std::move(auth_challenge_responder));
|
|
- auth_challenge_responder_remote->OnAuthCredentials(base::nullopt);
|
|
- return;
|
|
- }
|
|
new LoginHandlerDelegate(std::move(auth_challenge_responder),
|
|
std::move(web_contents_getter), auth_info,
|
|
is_request_for_main_frame, process_id, routing_id,
|
|
@@ -2573,15 +2563,21 @@ void StoragePartitionImpl::GetQuotaSettings(
|
|
return;
|
|
}
|
|
|
|
+ // CEF always returns false for IsOffTheRecord(), so also check the path.
|
|
+ const bool is_incognito = browser_context_->IsOffTheRecord() ||
|
|
+ browser_context_->GetPath().empty();
|
|
storage::GetNominalDynamicSettings(
|
|
- GetPath(), browser_context_->IsOffTheRecord(),
|
|
+ GetPath(), is_incognito,
|
|
storage::GetDefaultDeviceInfoHelper(), std::move(callback));
|
|
}
|
|
|
|
void StoragePartitionImpl::InitNetworkContext() {
|
|
network_context_ = GetContentClient()->browser()->CreateNetworkContext(
|
|
browser_context_, is_in_memory_, relative_partition_path_);
|
|
- DCHECK(network_context_);
|
|
+ if (!network_context_) {
|
|
+ // May happen during shutdown.
|
|
+ return;
|
|
+ }
|
|
|
|
network_context_client_receiver_.reset();
|
|
network_context_->SetClient(
|