Update to Chromium version 70.0.3538.7

This commit is contained in:
Marshall Greenblatt 2018-09-05 22:22:57 +02:00
parent a64237bcb0
commit 5fa11acf79
3 changed files with 6 additions and 6 deletions

View File

@ -7,5 +7,5 @@
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
{ {
'chromium_checkout': 'refs/tags/70.0.3538.0', 'chromium_checkout': 'refs/tags/70.0.3538.7',
} }

View File

@ -1,5 +1,5 @@
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
index ae76265b33a6..a3b7580d0046 100644 index 52ab34ca40a7..33f8673f54d4 100644
--- chrome/browser/BUILD.gn --- chrome/browser/BUILD.gn
+++ chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn
@@ -8,6 +8,7 @@ import("//build/config/features.gni") @@ -8,6 +8,7 @@ import("//build/config/features.gni")
@ -10,7 +10,7 @@ index ae76265b33a6..a3b7580d0046 100644
import("//chrome/common/features.gni") import("//chrome/common/features.gni")
import("//components/feature_engagement/features.gni") import("//components/feature_engagement/features.gni")
import("//components/feed/features.gni") import("//components/feed/features.gni")
@@ -1689,6 +1690,7 @@ jumbo_split_static_library("browser") { @@ -1691,6 +1692,7 @@ jumbo_split_static_library("browser") {
"//base:i18n", "//base:i18n",
"//base/allocator:buildflags", "//base/allocator:buildflags",
"//cc", "//cc",
@ -18,7 +18,7 @@ index ae76265b33a6..a3b7580d0046 100644
"//chrome:extra_resources", "//chrome:extra_resources",
"//chrome:resources", "//chrome:resources",
"//chrome:strings", "//chrome:strings",
@@ -1963,6 +1965,10 @@ jumbo_split_static_library("browser") { @@ -1965,6 +1967,10 @@ jumbo_split_static_library("browser") {
] ]
} }

View File

@ -1,8 +1,8 @@
diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd
index c700d8b74bcb..9a01101ba673 100644 index b615103c64c1..d110be48ee0e 100644
--- chrome/app/generated_resources.grd --- chrome/app/generated_resources.grd
+++ chrome/app/generated_resources.grd +++ chrome/app/generated_resources.grd
@@ -4478,7 +4478,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -4496,7 +4496,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
</message> </message>
</if> </if>
<message name="IDS_PLUGIN_BLOCKED_BY_POLICY" desc="The placeholder text for a plugin blocked by enterprise policy."> <message name="IDS_PLUGIN_BLOCKED_BY_POLICY" desc="The placeholder text for a plugin blocked by enterprise policy.">