mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 74.0.3729.0 (#638880)
- Windows: 10.0.17763.0 SDK is now required. - Mac: 10.13 SDK is now required. - Removed CefRequestContext::ResolveHostCached which is no longer supported by Chromium.
This commit is contained in:
committed by
Marshall Greenblatt
parent
58e1149c71
commit
725ed88529
@ -1,5 +1,5 @@
|
||||
diff --git build/config/linux/gtk/BUILD.gn build/config/linux/gtk/BUILD.gn
|
||||
index 6624d138e14a..1ae9cadc4f3a 100644
|
||||
index d78f7407c179..0bb79883e16c 100644
|
||||
--- build/config/linux/gtk/BUILD.gn
|
||||
+++ build/config/linux/gtk/BUILD.gn
|
||||
@@ -4,8 +4,10 @@
|
||||
@ -68,10 +68,10 @@ index faae7805435a..5101e0d51bf2 100644
|
||||
|
||||
void ChromeBrowserMainExtraPartsViewsLinux::ToolkitInitialized() {
|
||||
diff --git chrome/test/BUILD.gn chrome/test/BUILD.gn
|
||||
index f691b9c4be33..e9dec0b09c8b 100644
|
||||
index fd7f3e60a599..9678ad4828cf 100644
|
||||
--- chrome/test/BUILD.gn
|
||||
+++ chrome/test/BUILD.gn
|
||||
@@ -4085,7 +4085,7 @@ test("unit_tests") {
|
||||
@@ -4115,7 +4115,7 @@ test("unit_tests") {
|
||||
"../browser/ui/input_method/input_method_engine_unittest.cc",
|
||||
]
|
||||
}
|
||||
@ -80,7 +80,7 @@ index f691b9c4be33..e9dec0b09c8b 100644
|
||||
sources +=
|
||||
[ "../browser/ui/libgtkui/select_file_dialog_impl_gtk_unittest.cc" ]
|
||||
deps += [ "//build/config/linux/gtk" ]
|
||||
@@ -4106,7 +4106,7 @@ test("unit_tests") {
|
||||
@@ -4136,7 +4136,7 @@ test("unit_tests") {
|
||||
if (use_gio) {
|
||||
configs += [ "//build/linux:gio_config" ]
|
||||
}
|
||||
@ -89,7 +89,7 @@ index f691b9c4be33..e9dec0b09c8b 100644
|
||||
deps += [ "//chrome/browser/ui/libgtkui" ]
|
||||
}
|
||||
|
||||
@@ -5119,7 +5119,7 @@ if (!is_android) {
|
||||
@@ -5152,7 +5152,7 @@ if (!is_android) {
|
||||
# suites, it seems like one or another starts timing out too.
|
||||
"../browser/ui/views/keyboard_access_browsertest.cc",
|
||||
]
|
||||
@ -99,10 +99,10 @@ index f691b9c4be33..e9dec0b09c8b 100644
|
||||
"../browser/ui/libgtkui/select_file_dialog_interactive_uitest.cc",
|
||||
]
|
||||
diff --git remoting/host/BUILD.gn remoting/host/BUILD.gn
|
||||
index ff592fdd56d2..80cdc2093175 100644
|
||||
index 647f01cfae49..fdbc8f8d49aa 100644
|
||||
--- remoting/host/BUILD.gn
|
||||
+++ remoting/host/BUILD.gn
|
||||
@@ -350,7 +350,7 @@ static_library("common") {
|
||||
@@ -351,7 +351,7 @@ static_library("common") {
|
||||
"//build/config/linux:xrandr",
|
||||
]
|
||||
deps += [ "//remoting/host/linux:x11" ]
|
||||
@ -111,7 +111,7 @@ index ff592fdd56d2..80cdc2093175 100644
|
||||
deps += [ "//build/config/linux/gtk" ]
|
||||
}
|
||||
} else {
|
||||
@@ -732,7 +732,7 @@ if (enable_me2me_host) {
|
||||
@@ -733,7 +733,7 @@ if (enable_me2me_host) {
|
||||
deps += [ "//components/policy:generated" ]
|
||||
}
|
||||
|
||||
@ -121,12 +121,12 @@ index ff592fdd56d2..80cdc2093175 100644
|
||||
}
|
||||
if ((is_linux && !is_chromeos) || is_mac) {
|
||||
diff --git remoting/host/file_transfer/BUILD.gn remoting/host/file_transfer/BUILD.gn
|
||||
index d8985375e279..bf034bc990f5 100644
|
||||
index ffaaa0b5b423..9fc7f88859a9 100644
|
||||
--- remoting/host/file_transfer/BUILD.gn
|
||||
+++ remoting/host/file_transfer/BUILD.gn
|
||||
@@ -60,7 +60,7 @@ source_set("common") {
|
||||
"//remoting/protocol",
|
||||
]
|
||||
@@ -35,7 +35,7 @@ source_set("file_transfer") {
|
||||
sources -= [ "get_desktop_directory.cc" ]
|
||||
}
|
||||
|
||||
- if (is_desktop_linux) {
|
||||
+ if (is_desktop_linux && use_gtk) {
|
||||
@ -169,10 +169,10 @@ index a07f8b0254af..970c1a54b4d2 100644
|
||||
}
|
||||
}
|
||||
diff --git remoting/test/BUILD.gn remoting/test/BUILD.gn
|
||||
index 2b7d0d78eef9..4feb3a244da9 100644
|
||||
index d916fa822a8f..245c0e006cdf 100644
|
||||
--- remoting/test/BUILD.gn
|
||||
+++ remoting/test/BUILD.gn
|
||||
@@ -149,7 +149,7 @@ if (enable_remoting_host && !is_android && !is_chromeos) {
|
||||
@@ -148,7 +148,7 @@ if (enable_remoting_host && !is_android && !is_chromeos) {
|
||||
":it2me_standalone_host",
|
||||
]
|
||||
|
||||
|
Reference in New Issue
Block a user