bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 96.0.4664.0 (#929512)

Browse Source
This commit is contained in:
Marshall Greenblatt
2021-10-18 18:17:16 -04:00
parent 4dd314dec3
commit 6872dadd74
103 changed files with 897 additions and 675 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
patch/patches/chrome_browser_net_export.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
index e5811d45bd4b6..4f532d65e963f 100644
index e9a748c91f743..1b4cc72352e67 100644
--- chrome/browser/ui/BUILD.gn
+++ chrome/browser/ui/BUILD.gn
@@ -11,6 +11,7 @@ import("//build/config/features.gni")
@ -10,7 +10,7 @@ index e5811d45bd4b6..4f532d65e963f 100644
import("//chrome/browser/buildflags.gni")
import("//chrome/common/features.gni")
import("//chromeos/assistant/assistant.gni")
@@ -347,6 +348,10 @@ static_library("ui") {
@@ -357,6 +358,10 @@ static_library("ui") {
"//build/config/compiler:wexit_time_destructors",
]
@ -21,7 +21,7 @@ index e5811d45bd4b6..4f532d65e963f 100644
# Since browser and browser_ui actually depend on each other,
# we must omit the dependency from browser_ui to browser.
# However, this means browser_ui and browser should more or less
@@ -369,6 +374,7 @@ static_library("ui") {
@@ -379,6 +384,7 @@ static_library("ui") {
"//build:branding_buildflags",
"//build:chromeos_buildflags",
"//cc/paint",
@ -29,7 +29,7 @@ index e5811d45bd4b6..4f532d65e963f 100644
"//chrome:extra_resources",
"//chrome:resources",
"//chrome:strings",
@@ -4984,6 +4990,7 @@ static_library("ui") {
@@ -5053,6 +5059,7 @@ static_library("ui") {
if (enable_basic_printing) {
deps += [
"//components/printing/browser",
@ -38,7 +38,7 @@ index e5811d45bd4b6..4f532d65e963f 100644
]
}
diff --git chrome/browser/ui/webui/net_export_ui.cc chrome/browser/ui/webui/net_export_ui.cc
index 096f4ca97179d..d2c731625b9d6 100644
index a57128a2803fe..1015d50db53ee 100644
--- chrome/browser/ui/webui/net_export_ui.cc
+++ chrome/browser/ui/webui/net_export_ui.cc
@@ -22,6 +22,7 @@
@ -58,9 +58,9 @@ index 096f4ca97179d..d2c731625b9d6 100644
+#endif
+
#if defined(OS_ANDROID)
#include "chrome/browser/android/intent_helper.h"
#include "components/browser_ui/share/android/intent_helper.h"
#endif
@@ -138,6 +143,13 @@ class NetExportMessageHandler
@@ -142,6 +147,13 @@ class NetExportMessageHandler
// NetLog file.
void ShowSelectFileDialog(const base::FilePath& default_path);
@ -74,7 +74,7 @@ index 096f4ca97179d..d2c731625b9d6 100644
// Cached pointer to SystemNetworkContextManager's NetExportFileWriter.
net_log::NetExportFileWriter* file_writer_;
@@ -233,6 +245,13 @@ void NetExportMessageHandler::OnStartNetLog(const base::ListValue* list) {
@@ -235,6 +247,13 @@ void NetExportMessageHandler::OnStartNetLog(const base::ListValue* list) {
if (UsingMobileUI()) {
StartNetLog(base::FilePath());
} else {
@ -88,7 +88,7 @@ index 096f4ca97179d..d2c731625b9d6 100644
base::FilePath initial_dir = last_save_dir.Pointer()->empty() ?
DownloadPrefs::FromBrowserContext(
web_ui()->GetWebContents()->GetBrowserContext())->DownloadPath() :
@@ -249,6 +268,7 @@ void NetExportMessageHandler::OnStopNetLog(const base::ListValue* list) {
@@ -251,6 +270,7 @@ void NetExportMessageHandler::OnStopNetLog(const base::ListValue* list) {
std::unique_ptr<base::DictionaryValue> ui_thread_polled_data(
new base::DictionaryValue());
@ -96,7 +96,7 @@ index 096f4ca97179d..d2c731625b9d6 100644
Profile* profile = Profile::FromWebUI(web_ui());
SetIfNotNull(ui_thread_polled_data.get(), "prerenderInfo",
chrome_browser_net::GetPrerenderInfo(profile));
@@ -258,6 +278,7 @@ void NetExportMessageHandler::OnStopNetLog(const base::ListValue* list) {
@@ -260,6 +280,7 @@ void NetExportMessageHandler::OnStopNetLog(const base::ListValue* list) {
SetIfNotNull(ui_thread_polled_data.get(), "serviceProviders",
chrome_browser_net::GetWindowsServiceProviders());
#endif
@ -104,7 +104,7 @@ index 096f4ca97179d..d2c731625b9d6 100644
file_writer_->StopNetLog(std::move(ui_thread_polled_data));
}
@@ -374,6 +395,38 @@ void NetExportMessageHandler::ShowSelectFileDialog(
@@ -375,6 +396,38 @@ void NetExportMessageHandler::ShowSelectFileDialog(
&file_type_info, 0, base::FilePath::StringType(), owning_window, nullptr);
}