mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 135.0.7049.0 (#1427262)
This commit is contained in:
@ -1,18 +1,18 @@
|
||||
diff --git chrome/browser/download/chrome_download_manager_delegate.cc chrome/browser/download/chrome_download_manager_delegate.cc
|
||||
index 5149acb874523..02ff8061b79c2 100644
|
||||
index cfcae9fc073be..b8c140692facc 100644
|
||||
--- chrome/browser/download/chrome_download_manager_delegate.cc
|
||||
+++ chrome/browser/download/chrome_download_manager_delegate.cc
|
||||
@@ -31,6 +31,7 @@
|
||||
@@ -30,6 +30,7 @@
|
||||
#include "base/task/thread_pool.h"
|
||||
#include "base/time/time.h"
|
||||
#include "build/build_config.h"
|
||||
#include "build/chromeos_buildflags.h"
|
||||
+#include "cef/libcef/features/features.h"
|
||||
#include "chrome/browser/browser_process.h"
|
||||
#include "chrome/browser/download/bubble/download_bubble_prefs.h"
|
||||
#include "chrome/browser/download/download_core_service.h"
|
||||
@@ -158,6 +159,10 @@
|
||||
#include "chrome/browser/ash/policy/skyvault/skyvault_rename_handler.h"
|
||||
#endif
|
||||
@@ -164,6 +165,10 @@
|
||||
#endif // BUILDFLAG(ENABLE_EXTENSIONS)
|
||||
#endif // BUILDFLAG(SAFE_BROWSING_DOWNLOAD_PROTECTION)
|
||||
|
||||
+#if BUILDFLAG(ENABLE_CEF)
|
||||
+#include "cef/libcef/browser/download_manager_delegate.h"
|
||||
@ -21,7 +21,7 @@ index 5149acb874523..02ff8061b79c2 100644
|
||||
using content::BrowserThread;
|
||||
using content::DownloadManager;
|
||||
using download::DownloadItem;
|
||||
@@ -516,6 +521,11 @@ ChromeDownloadManagerDelegate::ChromeDownloadManagerDelegate(Profile* profile)
|
||||
@@ -523,6 +528,11 @@ ChromeDownloadManagerDelegate::ChromeDownloadManagerDelegate(Profile* profile)
|
||||
download_dialog_bridge_ = std::make_unique<DownloadDialogBridge>();
|
||||
download_message_bridge_ = std::make_unique<DownloadMessageBridge>();
|
||||
#endif
|
||||
@ -33,7 +33,7 @@ index 5149acb874523..02ff8061b79c2 100644
|
||||
}
|
||||
|
||||
ChromeDownloadManagerDelegate::~ChromeDownloadManagerDelegate() {
|
||||
@@ -575,6 +585,9 @@ void ChromeDownloadManagerDelegate::Shutdown() {
|
||||
@@ -586,6 +596,9 @@ void ChromeDownloadManagerDelegate::Shutdown() {
|
||||
download_manager_->RemoveObserver(this);
|
||||
download_manager_ = nullptr;
|
||||
}
|
||||
@ -43,7 +43,7 @@ index 5149acb874523..02ff8061b79c2 100644
|
||||
}
|
||||
|
||||
void ChromeDownloadManagerDelegate::OnDownloadCanceledAtShutdown(
|
||||
@@ -643,6 +656,12 @@ bool ChromeDownloadManagerDelegate::DetermineDownloadTarget(
|
||||
@@ -654,6 +667,12 @@ bool ChromeDownloadManagerDelegate::DetermineDownloadTarget(
|
||||
ReportPDFLoadStatus(PDFLoadStatus::kTriggeredNoGestureDriveByDownload);
|
||||
}
|
||||
|
||||
@ -56,22 +56,23 @@ index 5149acb874523..02ff8061b79c2 100644
|
||||
DownloadTargetDeterminer::CompletionCallback target_determined_callback =
|
||||
base::BindOnce(&ChromeDownloadManagerDelegate::OnDownloadTargetDetermined,
|
||||
weak_ptr_factory_.GetWeakPtr(), download->GetId(),
|
||||
@@ -1134,8 +1153,11 @@ void ChromeDownloadManagerDelegate::OpenDownload(DownloadItem* download) {
|
||||
Browser* browser =
|
||||
web_contents ? chrome::FindBrowserWithTab(web_contents) : nullptr;
|
||||
std::unique_ptr<chrome::ScopedTabbedBrowserDisplayer> browser_displayer;
|
||||
- if (!browser ||
|
||||
- !browser->CanSupportWindowFeature(Browser::FEATURE_TABSTRIP)) {
|
||||
+ if (!browser
|
||||
@@ -1142,8 +1161,13 @@ void ChromeDownloadManagerDelegate::OpenDownload(DownloadItem* download) {
|
||||
return;
|
||||
}
|
||||
|
||||
+
|
||||
Browser* browser = chrome::ScopedTabbedBrowserDisplayer(profile_).browser();
|
||||
- CHECK(browser && browser->CanSupportWindowFeature(Browser::FEATURE_TABSTRIP));
|
||||
+ CHECK(browser
|
||||
+#if !BUILDFLAG(ENABLE_CEF)
|
||||
+ || !browser->CanSupportWindowFeature(Browser::FEATURE_TABSTRIP)
|
||||
+ && browser->CanSupportWindowFeature(Browser::FEATURE_TABSTRIP)
|
||||
+#endif
|
||||
+ ) {
|
||||
browser_displayer =
|
||||
std::make_unique<chrome::ScopedTabbedBrowserDisplayer>(profile_);
|
||||
browser = browser_displayer->browser();
|
||||
+ );
|
||||
content::OpenURLParams params(
|
||||
net::FilePathToFileURL(download->GetTargetFilePath()),
|
||||
content::Referrer(), WindowOpenDisposition::NEW_FOREGROUND_TAB,
|
||||
diff --git chrome/browser/download/chrome_download_manager_delegate.h chrome/browser/download/chrome_download_manager_delegate.h
|
||||
index 04eb2a8d15f4d..740b869961528 100644
|
||||
index 41db535e5cf9c..015d84cc95b49 100644
|
||||
--- chrome/browser/download/chrome_download_manager_delegate.h
|
||||
+++ chrome/browser/download/chrome_download_manager_delegate.h
|
||||
@@ -19,6 +19,7 @@
|
||||
@ -95,7 +96,7 @@ index 04eb2a8d15f4d..740b869961528 100644
|
||||
// This is the Chrome side helper for the download system.
|
||||
class ChromeDownloadManagerDelegate
|
||||
: public content::DownloadManagerDelegate,
|
||||
@@ -404,6 +411,10 @@ class ChromeDownloadManagerDelegate
|
||||
@@ -406,6 +413,10 @@ class ChromeDownloadManagerDelegate
|
||||
// Whether a file picker dialog is showing.
|
||||
bool is_file_picker_showing_;
|
||||
|
||||
|
Reference in New Issue
Block a user