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.

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 from Chromium 76.0.3809.87 to Chromium 77.0.3865.10 #3089

Closed
wants to merge 26 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
a289bf5
Update patches from Chromium 76.0.3809.87 to Chromium 77.0.3865.10
mkarolin Jul 24, 2019
70ddd21
Process version shouldn't create a source set.
mkarolin Jul 24, 2019
68ceae3
Updated chrome_constants override with the changes in the original.
mkarolin Jul 25, 2019
3c5b5da
OmniboxInputType::INVALID was renamed to EMPTY.
mkarolin Jul 25, 2019
5990b61
Updated HandleExternalProtocol signature in BraveContentBrowserClient.
mkarolin Jul 31, 2019
df02c7d
Updated signature of BraveExtensionsAPIClient::ShouldHideBrowserNetwo…
mkarolin Jul 31, 2019
7665708
AddRestoredTab now takes a tab group param.
mkarolin Jul 31, 2019
84d8cbd
content/public interfaces are no longer const.
mkarolin Jul 31, 2019
94c08b2
.idl files aren't allowed in GN sources.
mkarolin Aug 2, 2019
466fcc1
Readded code to get top document GURL in NavigationRequest.
mkarolin Aug 2, 2019
bd45597
Moved start of Brave services to BraveBrowserMainExtraParts::PreMainM…
mkarolin Aug 2, 2019
420c35e
PrefProvider::is_incognito_ was renamed to off_the_record_.
mkarolin Aug 2, 2019
591be33
APISignature::ParseArgumentsToJSON signature change.
mkarolin Aug 5, 2019
66a7c6d
ComponentLoader ctor signature change.
mkarolin Aug 5, 2019
40e5d24
SimplifyHttpsIndicator feature is now on by default.
mkarolin Aug 5, 2019
b434c77
Removed Win10 specific welcome UI flow.
mkarolin Aug 6, 2019
7ec6c6c
Signin restructure.
mkarolin Aug 6, 2019
6a2ba54
Use base::Contains instead of ContainsKey.
mkarolin Aug 6, 2019
7e70b0b
IOThread class has been removed.
mkarolin Aug 6, 2019
01aa4b4
Fixes compilation of brave_actions_container.h
mkarolin Aug 6, 2019
6445003
views::BoxLayout orientation is now a class enum.
mkarolin Aug 6, 2019
3d02930
Fixes RenderViewContextMenu override compilation.
mkarolin Aug 6, 2019
f4dc03c
BookmarkChangeProcessor overrides now use size_t.
mkarolin Aug 6, 2019
9221940
BookmarkNode::set_type was removed.
mkarolin Aug 5, 2019
7009ef4
Update strings for 77.0.3865.10.
mkarolin Jul 25, 2019
43ed3c5
TreeNode::GetChild and child_count were removed.
mkarolin Aug 7, 2019
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Next

Update patches from Chromium 76.0.3809.87 to Chromium 77.0.3865.10

  • Loading branch information
mkarolin committed Jul 24, 2019
commit a289bf5c29c006787070fbd8996e96a089b4401e
@@ -1,5 +1,5 @@
diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
index 7063da0f26c5691f01214c2dc014128d7c8c5e09..3e18855c2a74036033999cd060a7f577925d0ee4 100644
index db7ab0255b482d4e1fd20a31cfec86a24546602a..1cc44592d0d854f17cf3d2f5a5e0c2ed76b2d025 100644
--- a/build/config/BUILDCONFIG.gn
+++ b/build/config/BUILDCONFIG.gn
@@ -419,6 +419,7 @@ set_sources_assignment_filter(sources_assignment_filter)
@@ -1,5 +1,5 @@
diff --git a/build/config/android/config.gni b/build/config/android/config.gni
index 58838421c8a3cb995d3b41c59fac24523c57dafa..fb3715e80a24f7de149e7d7301e209a148c30d0f 100644
index bed796ebe45e47af39bb3f27383cf23bc028adb3..7c0707454b7e3c435d793c1e300755f3d8bcb9c2 100644
--- a/build/config/android/config.gni
+++ b/build/config/android/config.gni
@@ -3,6 +3,7 @@
@@ -1,5 +1,5 @@
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index e06ba8ee8bcf4cc240029fc66a7c2681786217a0..a77998f9bd28b8a9965a7e10611c2ace21f4991c 100644
index e107dd9f5d264b17601a67edafe9bd61c4d767c3..743b82cb3b6a92dcc544e9aed789024b5e1960fa 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -190,6 +190,10 @@ if (!is_android && !is_mac) {
@@ -13,31 +13,31 @@ index e06ba8ee8bcf4cc240029fc66a7c2681786217a0..a77998f9bd28b8a9965a7e10611c2ace

deps += [
":chrome_dll",
@@ -289,6 +293,7 @@ if (!is_android && !is_mac) {
@@ -297,6 +301,7 @@ if (!is_android && !is_mac) {
"//headless:headless_shell_lib",
"//services/service_manager/embedder",
]
+ deps += [ "//components/unified_consent" ]

public_deps = [
":xdg_mime", # Needs to be public for installer to consume files.
@@ -435,6 +440,7 @@ if (is_win) {
@@ -431,6 +436,7 @@ if (is_win) {
"//third_party/wtl",
"//ui/views",
]
+ deps += [ "//components/unified_consent" ]

ldflags = [
"/DELAYLOAD:advapi32.dll",
@@ -569,6 +575,7 @@ if (is_win) {
@@ -566,6 +572,7 @@ if (is_win) {
"//headless:headless_shell_child_lib",
"//services/service_manager/embedder",
]
+ deps += [ "//components/unified_consent" ]

ldflags = [
"/DELAYLOAD:comctl32.dll",
@@ -680,6 +687,11 @@ if (is_win) {
@@ -677,6 +684,11 @@ if (is_win) {
]
}

@@ -49,15 +49,15 @@ index e06ba8ee8bcf4cc240029fc66a7c2681786217a0..a77998f9bd28b8a9965a7e10611c2ace
mac_app_bundle("chrome_app") {
output_name = chrome_product_full_name

@@ -713,6 +725,7 @@ if (is_win) {
@@ -710,6 +722,7 @@ if (is_win) {
rebase_path("app/app.exports", root_build_dir) ]
}
}
+}

compiled_action("chrome_app_strings") {
tool = "//chrome/tools/build/mac:infoplist_strings_tool"
@@ -742,7 +755,7 @@ if (is_win) {
@@ -739,7 +752,7 @@ if (is_win) {
args =
[
"-b",
@@ -66,7 +66,7 @@ index e06ba8ee8bcf4cc240029fc66a7c2681786217a0..a77998f9bd28b8a9965a7e10611c2ace
"-v",
rebase_path(chrome_version_file, root_build_dir),
"-g",
@@ -823,7 +836,7 @@ if (is_win) {
@@ -820,7 +833,7 @@ if (is_win) {
# framework itself, that would cause a cyclical dependency. Instead,
# this dependency directly copies the file into the framework's
# resources directory.
@@ -75,15 +75,15 @@ index e06ba8ee8bcf4cc240029fc66a7c2681786217a0..a77998f9bd28b8a9965a7e10611c2ace
}
}

@@ -1249,6 +1262,7 @@ if (is_win) {
@@ -1247,6 +1260,7 @@ if (is_win) {
"//services/service_manager/embedder",
"//third_party/cld_3/src/src:cld_3",
]
+ deps += [ "//components/unified_consent" ]

if (is_component_build) {
libs = [ "Carbon.framework" ]
@@ -1313,6 +1327,10 @@ if (is_win) {
@@ -1311,6 +1325,10 @@ if (is_win) {
if (is_chrome_branded) {
deps += [ ":default_apps" ]
}
@@ -94,15 +94,15 @@ index e06ba8ee8bcf4cc240029fc66a7c2681786217a0..a77998f9bd28b8a9965a7e10611c2ace

ldflags = [ "-Wl,-install_name,@executable_path/../Frameworks/$chrome_framework_name.framework/Versions/$chrome_version_full/$chrome_framework_name" ]

@@ -1483,6 +1501,7 @@ if (is_win) {
@@ -1475,6 +1493,7 @@ if (is_win) {

group("browser_dependencies") {
public_deps = [
+ "//brave:browser_dependencies",
"//chrome/browser",
"//chrome/common",
"//components/gwp_asan/buildflags",
@@ -1556,13 +1575,14 @@ group("child_dependencies") {
@@ -1547,13 +1566,14 @@ group("child_dependencies") {
# this is OK because all of content is linked into one library.
"//content/browser",
]
@@ -118,15 +118,15 @@ index e06ba8ee8bcf4cc240029fc66a7c2681786217a0..a77998f9bd28b8a9965a7e10611c2ace
]
output = "$target_gen_dir/chrome_exe_version.rc"
}
@@ -1635,6 +1655,7 @@ group("resources") {
@@ -1626,6 +1646,7 @@ group("resources") {
"//chrome/browser:resources",
"//chrome/common:resources",
"//chrome/renderer:resources",
+ "//brave:resources",
]
}

@@ -1886,6 +1907,7 @@ if (is_android) {
@@ -1881,6 +1902,7 @@ if (is_android) {
"//content/public/common:service_names",
"//services/service_manager/embedder",
]
@@ -1,11 +1,11 @@
diff --git a/chrome/VERSION b/chrome/VERSION
index 6a52b54b1d3314ee9e19f09ca72ec51cc46e3fbf..c9281cf39796d00e464a7b554c9b6b60d60d4169 100644
index 0885949d02c5a786c7640e0d2d788e19bd6338cd..37bc631f63dac7287bedc219941ab20ebb0f16e9 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=76
MAJOR=77
MINOR=0
-BUILD=3809
-PATCH=87
-BUILD=3865
-PATCH=10
+BUILD=70
+PATCH=29
@@ -1,25 +1,25 @@
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 17311184c47823594b49ad07d41bd870efa7af17..8f11dbdaa0491f676a867f5e0ce134d7e32b5a1d 100644
index 81a2c9a9137931f10842d26efd253c02a5c332fe..65e46f0f1fb4384cf851c9d02c66b8f8bea12b35 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -42,7 +42,7 @@ if (dfmify_devtools) {
import("//chrome/android/features/devtools/devtools_module_tmpl.gni")
}
@@ -31,7 +31,7 @@ import("java_sources.gni")
import("static_initializers.gni")
import("trichrome.gni")

-manifest_package = "org.chromium.chrome"
+declare_args() { manifest_package = "org.chromium.chrome" }
test_manifest_package = "org.chromium.chrome.tests"
-chrome_public_manifest_package = "org.chromium.chrome"
+declare_args() { chrome_public_manifest_package = "org.chromium.chrome" }
chrome_public_test_manifest_package = "org.chromium.chrome.tests"

chrome_public_jinja_variables = default_chrome_public_jinja_variables +
@@ -110,6 +110,7 @@ android_resources("chrome_app_java_resources") {
chrome_public_jinja_variables =
@@ -100,6 +100,7 @@ android_resources("chrome_app_java_resources") {
deps = [
":chrome_strings_grd",
":ui_locale_string_resources",
+ "//brave/build/android:android_brave_strings_grd",
"//chrome/android/webapk/libs/common:splash_resources",
"//chrome/app:java_strings_grd",
"//components/autofill/android:autofill_java_resources",
@@ -496,6 +497,7 @@ java_group("chrome_all_java") {
@@ -524,6 +525,7 @@ java_group("chrome_all_java") {
group("jni_headers") {
public_deps = [
":chrome_jni_headers",
@@ -1,10 +1,10 @@
diff --git a/chrome/android/java/res/layout/toolbar_phone.xml b/chrome/android/java/res/layout/toolbar_phone.xml
index 62a3a3f3dc36d6417519832e987466ff26a18ea2..e4cdbe17da6b3db357992f755aa884b1f026a7a8 100644
index fe66549d3ac660c12186e0c9c78c7ed525f2015d..ca3724c9c28c4c73f1462413d8ae3c45157d7688 100644
--- a/chrome/android/java/res/layout/toolbar_phone.xml
+++ b/chrome/android/java/res/layout/toolbar_phone.xml
@@ -40,6 +40,7 @@
style="@style/ToolbarButton"
android:paddingStart="8dp"
android:paddingStart="12dp"
android:visibility="gone" />
+ <include layout="@layout/brave_toolbar_phone" android:layout_height="wrap_content" android:layout_width="match_parent" />

@@ -1,5 +1,5 @@
diff --git a/chrome/android/java/res/layout/toolbar_tablet.xml b/chrome/android/java/res/layout/toolbar_tablet.xml
index 4ead17fd19f45a22d4c13877726b58658ac82e89..b0ce885e30c098dd2bd7295a48b72d87caeb320b 100644
index 12630f4cd02676d1676eaea5617bf20689192697..a0ce1391b34449efa0dadfaea0d783d31a9da8c8 100644
--- a/chrome/android/java/res/layout/toolbar_tablet.xml
+++ b/chrome/android/java/res/layout/toolbar_tablet.xml
@@ -75,6 +75,7 @@
@@ -1,10 +1,10 @@
diff --git a/chrome/android/java/res/values-v17/styles.xml b/chrome/android/java/res/values-v17/styles.xml
index 9ed5215c71585875e33a359fe0ef43aae3c51139..eb8fe23b007d795ce079a31b6c2f7ae8725e37f1 100644
index 5b41c992fb2b17c1b8a8a06ecc09460c4190fa86..b4a36c8d48dcc89a1dd0e9c661f4d3eedc757ed8 100644
--- a/chrome/android/java/res/values-v17/styles.xml
+++ b/chrome/android/java/res/values-v17/styles.xml
@@ -919,4 +919,5 @@
<item name="android:layout_height">@dimen/omnibox_suggestion_edit_url_min_height</item>
<item name="tint">@color/default_icon_color</item>
@@ -995,4 +995,5 @@
<item name="android:textAlignment">viewStart</item>
<item name="android:textAppearance">@style/TextAppearance.BlackTitle1</item>
</style>
+ <style name="BraveSwitchTheme"> <item name="colorControlActivated">#fb542b</item> </style>
</resources>
@@ -1,8 +1,8 @@
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
index 6bdd439f89a68e8b53bf077547ad04bc35414674..366524b92af5979ed4be1bac159cae6da8896a09 100644
index a168b085348c218c2951964beb37e0a25d754836..ad5cf672b9548a4f9921c4bc3521a0c8111e998d 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
@@ -182,7 +182,7 @@ import java.util.Locale;
@@ -174,7 +174,7 @@ import java.util.Locale;
* are accessible via a chrome specific tab switching UI.
*/
public class ChromeTabbedActivity

This file was deleted.

@@ -1,8 +1,8 @@
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
index 9610f24f8a43e081fc260ab4be93718488fe624f..c5d274690e8bfc223935206f287d82b99d52eef8 100644
index 6b0082fe76b27d72b5d90c7047e9e23173dd0afc..cc1ab03f9a7c149da521375cfc18b70aaa83fdd2 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
@@ -88,7 +88,7 @@ import java.util.List;
@@ -86,7 +86,7 @@ import java.util.List;
/**
* Phone specific toolbar implementation.
*/
@@ -11,7 +11,7 @@ index 9610f24f8a43e081fc260ab4be93718488fe624f..c5d274690e8bfc223935206f287d82b9
NewTabPage.OnSearchBoxScrollListener,
TabCountObserver {
/** The amount of time transitioning from one theme color to another should take in ms. */
@@ -426,10 +426,12 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O
@@ -422,10 +422,12 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O
/**
* Set the background color of the location bar to appropriately match the theme color.
*/
@@ -25,15 +25,15 @@ index 9610f24f8a43e081fc260ab4be93718488fe624f..c5d274690e8bfc223935206f287d82b9
}

/**
@@ -546,6 +548,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O
@@ -542,6 +544,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O
.notifyEvent(EventConstants.PARTNER_HOME_PAGE_BUTTON_PRESSED);
}
}
+ super.onClick(v);
}

@Override
@@ -719,7 +722,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O
@@ -715,7 +718,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O
* @return The right bounds of the location bar after accounting for any visible left buttons.
*/
private int getBoundsAfterAccountingForRightButtons() {
@@ -42,7 +42,7 @@ index 9610f24f8a43e081fc260ab4be93718488fe624f..c5d274690e8bfc223935206f287d82b9
}

private void updateToolbarBackground(int color) {
@@ -2121,6 +2124,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O
@@ -2130,6 +2133,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O
} else {
populateUrlClearFocusingAnimatorSet(animators);
}
@@ -1,8 +1,8 @@
diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
index 8aedf50897e9b40ca6b9617bb1a8ac766a6da16a..3ec678a94edda05c74640dcdbf63792a12ecc3dc 100644
index ba374328abaf898aa5dd233f12673efb558c99ae..546ee1b26bbc68ca2c2d94aa42b93c836debac4f 100644
--- a/chrome/android/java_sources.gni
+++ b/chrome/android/java_sources.gni
@@ -15,6 +15,7 @@ import("//components/offline_pages/buildflags/features.gni")
@@ -17,6 +17,7 @@ import("//components/offline_pages/buildflags/features.gni")
import("//device/vr/buildflags/buildflags.gni")

chrome_java_sources += public_autofill_assistant_java_sources
@@ -1,5 +1,5 @@
diff --git a/chrome/app/BUILD.gn b/chrome/app/BUILD.gn
index 590c4edcededad77172ae30e85b388b91d305b8e..ff494f3afd3dfaed475c89313116a45f64ffb565 100644
index 6e5ec5df6fb27d3e359304ed1eed873256bdd349..070bb918c76a46a8f2f8003ecf9d616e8982bbec 100644
--- a/chrome/app/BUILD.gn
+++ b/chrome/app/BUILD.gn
@@ -186,6 +186,8 @@ grit("generated_resources") {
@@ -20,10 +20,10 @@ index 590c4edcededad77172ae30e85b388b91d305b8e..ff494f3afd3dfaed475c89313116a45f
defines = chrome_grit_defines
output_dir = "$root_gen_dir/chrome"
outputs = [
@@ -348,6 +350,7 @@ static_library("test_support") {
@@ -347,6 +349,7 @@ static_library("test_support") {
"//components/gwp_asan/buildflags",
"//components/nacl/common:buildflags",
"//components/startup_metric_utils/browser:lib",
"//components/tracing",
+ "//components/unified_consent",
"//content/public/app:both",
"//content/public/common",
@@ -1,5 +1,5 @@
diff --git a/chrome/app/chrome_dll.rc b/chrome/app/chrome_dll.rc
index d994493407e6dc5c640dd16ce488818800c09d14..90846e8502e2cda2fd3a3bad4749f9977c501b12 100644
index 80a15b55d54f55ca13d6d79b3fd75d28ae0d647f..a0aa8fa83a4e93f7689a0ece2e6dbf9d10a4c175 100644
--- a/chrome/app/chrome_dll.rc
+++ b/chrome/app/chrome_dll.rc
@@ -164,6 +164,16 @@ END
@@ -1,16 +1,16 @@
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 4f9844f6f8546efe591e679c41c7cd3b43c371a8..0e86b115bef94df9821adeffe944b0d3a63b587c 100644
index dc27928a79181b702f34609c83e51fa0c1c31c02..02d362d9d24c25b922e2b3c895a134beaa8ca291 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2142,6 +2142,7 @@ jumbo_split_static_library("browser") {
@@ -2180,6 +2180,7 @@ jumbo_split_static_library("browser") {
"//ui/strings",
"//ui/surface",
"//ui/web_dialogs",
+ "//brave/browser:browser_process",
]

if (is_posix || is_fuchsia) {
@@ -2155,6 +2156,7 @@ jumbo_split_static_library("browser") {
@@ -2193,6 +2194,7 @@ jumbo_split_static_library("browser") {
}

if (is_android) {
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 61bb2977bb7c9711465a6928b45f6a69be7f4080..c8f888c1423d2e53fc94bffc9db0ab51c86e0a4d 100644
index 0b8ddb47afb626d63380d84101431f9fb152025e..a5b905c18968c1dbd4176498a6848af74068d4cc 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -254,14 +254,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = {
@@ -265,14 +265,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = {
const FeatureEntry::Choice kTraceUploadURL[] = {
{flags_ui::kGenericExperimentChoiceDisabled, "", ""},
{flag_descriptions::kTraceUploadUrlChoiceOther, switches::kTraceUploadURL,
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/autocomplete/autocomplete_classifier_factory.cc b/chrome/browser/autocomplete/autocomplete_classifier_factory.cc
index e3159144a0b7892e5580bfa910f2db97a81179a9..8ee42d9f6f7ac50c78a03e59aa2ba34e35dae725 100644
index 7f4dd5ffd15a0ea17fb77d712897a86370da4266..52d8469ae70f38e7a3c714f4761d4172915af138 100644
--- a/chrome/browser/autocomplete/autocomplete_classifier_factory.cc
+++ b/chrome/browser/autocomplete/autocomplete_classifier_factory.cc
@@ -68,7 +68,12 @@ AutocompleteClassifierFactory::~AutocompleteClassifierFactory() {
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.