Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update patches for 70.0.3538.54 #614

Merged
merged 1 commit into from
Oct 11, 2018
Merged

Update patches for 70.0.3538.54 #614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions patches/chrome-VERSION.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
diff --git a/chrome/VERSION b/chrome/VERSION
index fb3d4fb7da13188107e2f4d9d8d9cd398bbeb677..55986240df728e55406839f099e3a91753399627 100644
index 8c6652843328ea19977b94a194a844080dcf1e9b..55986240df728e55406839f099e3a91753399627 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=70
MINOR=0
-BUILD=3538
-PATCH=45
-PATCH=54
+BUILD=57
+PATCH=1
2 changes: 1 addition & 1 deletion patches/chrome-browser-BUILD.gn.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 33a36da42b37e78d496a6db0607cff58de43019e..6bab3ab321636406d1cbb06dc220a6d77d90ad28 100644
index ccc2e812de7b1b79c46a7e36cadd4e62731ae61a..c09dba627f0f79451394551781036d49b092ff65 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -1953,6 +1953,7 @@ jumbo_split_static_library("browser") {
Expand Down
4 changes: 2 additions & 2 deletions patches/chrome-browser-ui-BUILD.gn.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index e25cab1de327ec27b9449c9df40119ce5ea3915b..9a8acef7ba0e5a6694024aaadcd6ef13f6a92d2e 100644
index ea8b1a687eb567635a04e613b89b9a143b7c6af2..bc9ee6c3e5ac900df61a989661066039d4588da1 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -1010,6 +1010,7 @@ jumbo_split_static_library("ui") {
Expand All @@ -10,7 +10,7 @@ index e25cab1de327ec27b9449c9df40119ce5ea3915b..9a8acef7ba0e5a6694024aaadcd6ef13
allow_circular_includes_from +=
[ "//chrome/browser/ui/webui/bluetooth_internals" ]

@@ -2647,10 +2648,13 @@ jumbo_split_static_library("ui") {
@@ -2649,10 +2650,13 @@ jumbo_split_static_library("ui") {
]
deps += [ "//google_update" ]
} else {
Expand Down
4 changes: 2 additions & 2 deletions patches/chrome-common-pref_names.cc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index 1e396c70d74ecf913eae4190d72ad75ac0df3353..b8af885948e73dd7a41503eb842c6f01fdfeb370 100644
index 032c0ca4c781c042df5eb7bb33b2b9f5c57e1008..222ecc7db2ca7d3a8c38fac8d86d6d5a7625b008 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -1088,6 +1088,8 @@ const char kImportDialogBookmarks[] = "import_dialog_bookmarks";
@@ -1101,6 +1101,8 @@ const char kImportDialogBookmarks[] = "import_dialog_bookmarks";
const char kImportDialogHistory[] = "import_dialog_history";
const char kImportDialogSavedPasswords[] = "import_dialog_saved_passwords";
const char kImportDialogSearchEngine[] = "import_dialog_search_engine";
Expand Down
4 changes: 2 additions & 2 deletions patches/chrome-common-pref_names.h.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 975947f10f36e8090b3c9206218424d05c0b538b..471043b1cac8ec4585b4f4e57cd6b9e365c15f14 100644
index 2bc50a2e7be847a6e77c0c8aa82df77b53788690..1213bceaf2ec8532fe634e2279ea5c53bc4bf52b 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -362,6 +362,8 @@ extern const char kImportDialogBookmarks[];
@@ -365,6 +365,8 @@ extern const char kImportDialogBookmarks[];
extern const char kImportDialogHistory[];
extern const char kImportDialogSavedPasswords[];
extern const char kImportDialogSearchEngine[];
Expand Down
2 changes: 1 addition & 1 deletion patches/chrome-renderer-chrome_content_renderer_client.cc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index 78925a9dc0f085ad01d92392dc885240020d4e3b..9bde7df7d47c505d30e039cf4c4a30e0cfc6492c 100644
index d3f9d5ebe19770d6734b0a6a7fce09c480f0429e..f4016c24d2f69b35a566bd6d818bfa684a5d6732 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -19,6 +19,7 @@
Expand Down
2 changes: 1 addition & 1 deletion patches/chrome-test-BUILD.gn.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 46400e215af29b2c5973db408ec6ddff9050ed20..9d603dfb289291d16d998edb8f2e49e5124eff6a 100644
index b0b7066b6b087810dc98b2694504085d971e6542..8a14a811d2f2ed66e868f6c990bc3af1e812e62f 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -412,6 +412,8 @@ test("browser_tests") {
Expand Down