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

WIP: Update patches from Chromium 76.0.3809.100 to Chromium 77.0.3865.35 #3180

Closed
wants to merge 51 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
423a083
Update patches from Chromium 76.0.3809.100 to Chromium 77.0.3865.35
mkarolin Jul 24, 2019
bd9ec36
Process version shouldn't create a source set.
mkarolin Jul 24, 2019
d3f7753
Updated chrome_constants override with the changes in the original.
mkarolin Jul 25, 2019
1ab6a1a
OmniboxInputType::INVALID was renamed to EMPTY.
mkarolin Jul 25, 2019
94ca89d
Updated HandleExternalProtocol signature in BraveContentBrowserClient.
mkarolin Jul 31, 2019
62db6f1
Updated signature of BraveExtensionsAPIClient::ShouldHideBrowserNetwo…
mkarolin Jul 31, 2019
fcad3da
AddRestoredTab now takes a tab group param.
mkarolin Jul 31, 2019
c288e60
content/public interfaces are no longer const.
mkarolin Jul 31, 2019
e9d0417
Removed unused source_set from the build.
mkarolin Aug 2, 2019
51e9a45
Readded code to get top document GURL in NavigationRequest.
mkarolin Aug 2, 2019
04a52ec
Moved start of Brave services to BraveBrowserMainExtraParts::PreMainM…
mkarolin Aug 2, 2019
7356b53
PrefProvider::is_incognito_ was renamed to off_the_record_.
mkarolin Aug 2, 2019
001d02b
APISignature::ParseArgumentsToJSON signature change.
mkarolin Aug 5, 2019
a85619c
ComponentLoader ctor signature change.
mkarolin Aug 5, 2019
28afa6d
SimplifyHttpsIndicator feature is now on by default.
mkarolin Aug 5, 2019
780ef50
Removed Win10 specific welcome UI flow.
mkarolin Aug 6, 2019
41b5d1f
Signin restructure.
mkarolin Aug 6, 2019
ac771a5
Use base::Contains instead of ContainsKey.
mkarolin Aug 6, 2019
5ab6339
IOThread class has been removed.
mkarolin Aug 6, 2019
6cb9e48
Fixes compilation of brave_actions_container.h
mkarolin Aug 6, 2019
b7f5923
views::BoxLayout orientation is now a class enum.
mkarolin Aug 6, 2019
47fbab7
Fixes RenderViewContextMenu override compilation.
mkarolin Aug 6, 2019
35fce2e
Enable networking service.
mkarolin Aug 10, 2019
58c6807
Fixes location change of md_select_css.html.
mkarolin Aug 13, 2019
fdae8cf
GridLayout::AddView now takes unique_ptr.
mkarolin Aug 13, 2019
53b5099
GridLayout c'tor signature change.
mkarolin Aug 13, 2019
672cf89
Signature change in WillCreateURLLoaderFactory in
mkarolin Aug 14, 2019
f4050a9
Removed BraveNetworkDelegateBase and subclasses.
mkarolin Aug 14, 2019
e1d5146
Removed AllowGetCookie/AllowSetCookie from BraveContentBrowserClient.
mkarolin Aug 16, 2019
cccb7d4
StringDataSource replaced StringDataPipeProducer.
mkarolin Aug 15, 2019
abbd577
Fixes Chromium bluetooth UUID dependency bug.
mkarolin Aug 17, 2019
cda6703
TreeNode::GetChild and child_count were removed.
mkarolin Aug 20, 2019
ff7751d
syncer::Cryptographer c'tor signature change.
mkarolin Aug 20, 2019
fe976d2
Added a missing header include.
mkarolin Aug 20, 2019
37232ce
paper-button has been replaced with cr-button.
mkarolin Aug 19, 2019
5bc7db7
Fixes missing pref in Shields settings radio buttons.
mkarolin Aug 20, 2019
024cef0
Transition CSS from [dark] to @media.
mkarolin Aug 20, 2019
9625fa3
Unit tests: Fixes MCSClient API signature changes.
mkarolin Aug 12, 2019
8fc861a
Unit tests: fixes GCMDriver c'tor signature change.
mkarolin Aug 12, 2019
54d16c0
Unit tests: Fixes CreateProfileAsyncHelper signature.
mkarolin Aug 12, 2019
c85d11c
Unit test: BraveSyncServiceTest.GetDisableReasons fix.
mkarolin Aug 21, 2019
54b356e
Browser Test: SendToOmniboxAndSubmit signature change.
mkarolin Aug 21, 2019
42fe586
Browser Test: added missing overrides to BraveMockRenderViewContextMenu.
mkarolin Aug 21, 2019
49d495f
Browser Test: Removed SetUrlRequestMocksEnabled.
mkarolin Aug 21, 2019
1c405a2
Browser Test: Added a missing header include.
mkarolin Aug 21, 2019
884a909
Browser Test: Rename ContextualSuggestionsService => RemoteSuggestion…
mkarolin Aug 21, 2019
2fe7418
Browser Test: clean up disabled features.
mkarolin Aug 22, 2019
8dd6ea2
Moved starting of Brave services to PostBrowserStart.
mkarolin Aug 22, 2019
bfe3812
Browser Test: Allow intentional crash.
mkarolin Aug 22, 2019
67605b2
Update strings for 77.0.3865.19.
mkarolin Jul 25, 2019
8a0679d
TEMPORARY: commented out code affected by Chromium commit 6811de35a39…
mkarolin Aug 16, 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.100 to Chromium 77.0.3865.35

  • Loading branch information
mkarolin committed Jul 24, 2019
commit 423a083be62a92bdf53ccf7827e795e5e811922c
@@ -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 0c52ff3c73580e38b2828fabdeb0e9c340428ca3..c99d78bb59960edf586b9079677dcbf0b7ea6f92 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) {
@@ -1882,6 +1903,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 0f9c2987c0599cb48f0f52d4ffc542b2beeb7fb5..c10be37d87f8c96db079b952d7a7523c5e85977a 100644
index 3c9f9c97f434a9280d87d77e83093fa777c775ca..2bd36660e604103d80d5da7c00a9f014361dcd45 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=76
MAJOR=77
MINOR=0
-BUILD=3809
-PATCH=100
-BUILD=3865
-PATCH=35
+BUILD=71
+PATCH=25
@@ -1,25 +1,25 @@
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 17311184c47823594b49ad07d41bd870efa7af17..8f11dbdaa0491f676a867f5e0ce134d7e32b5a1d 100644
index 0c5467af2bce341e0b3f0835899c820f60adbc87..fa406bae2b98570995ba1331d2145723e13a9866 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,5 +1,5 @@
diff --git a/chrome/android/java/res/layout/toolbar_phone.xml b/chrome/android/java/res/layout/toolbar_phone.xml
index 62a3a3f3dc36d6417519832e987466ff26a18ea2..3c8c8cf4d83efae421571f57a5cc978dad4dab53 100644
index fe66549d3ac660c12186e0c9c78c7ed525f2015d..9f2fad8590812ececbf1b9d04ec493c2ed7da425 100644
--- a/chrome/android/java/res/layout/toolbar_phone.xml
+++ b/chrome/android/java/res/layout/toolbar_phone.xml
@@ -31,6 +31,7 @@
@@ -12,7 +12,7 @@ index 62a3a3f3dc36d6417519832e987466ff26a18ea2..3c8c8cf4d83efae421571f57a5cc978d
<ViewStub
@@ -40,6 +41,7 @@
style="@style/ToolbarButton"
android:paddingStart="8dp"
android:paddingStart="12dp"
android:visibility="gone" />
+ <include layout="@layout/brave_toolbar" 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..1a1d924eabe7f45f3f0c4b406bbac096a2375a2d 100644
index 12630f4cd02676d1676eaea5617bf20689192697..b7a56a2411f439d3ac476bcf33f5996d5ef047ac 100644
--- a/chrome/android/java/res/layout/toolbar_tablet.xml
+++ b/chrome/android/java/res/layout/toolbar_tablet.xml
@@ -75,6 +75,7 @@
@@ -1,8 +1,8 @@
diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res/values/dimens.xml
index 2d3a1ddc2d73e0a76b7115d6e0fa1bedd0ab659c..b803e7ed86d9632dd4f97d0d5bc7356ed6656ee9 100644
index e0a078063054229131277ff3878e6ef3ebeee61f..d93f0de960c134608342ba21c80151b9b6f80515 100644
--- a/chrome/android/java/res/values/dimens.xml
+++ b/chrome/android/java/res/values/dimens.xml
@@ -285,7 +285,7 @@
@@ -287,7 +287,7 @@
<dimen name="modern_toolbar_background_size">40dp</dimen>
<!-- Sometimes the modern toolbar is shown at 48dp so a corner radius of
24dp is needed to completely round the corners. -->
@@ -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 c851e676d0dffd3e5a53641e3cb4f2f434d3a984..fbb0802b0f13383131fce4a19ebc74cbce1d91b4 100644
index 5b41c992fb2b17c1b8a8a06ecc09460c4190fa86..b4a36c8d48dcc89a1dd0e9c661f4d3eedc757ed8 100644
--- a/chrome/android/java/res/values-v17/styles.xml
+++ b/chrome/android/java/res/values-v17/styles.xml
@@ -930,4 +930,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
@@ -1,5 +1,5 @@
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceManager.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceManager.java
index 80072b7f7afc55c1d893416b614267edbfb7b2da..091832ed91eea9462378b30ac3ec717e648e211e 100644
index e269ba6c0436afc362804823e557dfe38c600c3b..fc3699b450c22a9731ccce0723e69dfcf813cf3c 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceManager.java
@@ -21,7 +21,7 @@ import java.util.Set;

This file was deleted.

@@ -1,24 +1,24 @@
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
index 5e062152c274c9f03aecd657ac9009705ac48db5..510e5501295785f689599c358ee4ef0112598a48 100644
index 795a84107a8665a7795a14cba33687d5e5e9f460..5350dd06fc524bd8d64ab40d76cfee220c16f277 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
@@ -777,6 +777,7 @@ public class ToolbarManager implements ScrimObserver, ToolbarTabController, UrlF
@@ -782,6 +782,7 @@ public class ToolbarManager implements ScrimObserver, ToolbarTabController, UrlF
};

final OnClickListener shareButtonListener = v -> {
+/*
recordBottomToolbarUseForIPH();
RecordUserAction.record("MobileBottomToolbarShareButton");
boolean isIncognito = false;
@@ -784,6 +785,7 @@ public class ToolbarManager implements ScrimObserver, ToolbarTabController, UrlF
@@ -789,6 +790,7 @@ public class ToolbarManager implements ScrimObserver, ToolbarTabController, UrlF
isIncognito = mTabModelSelector.getCurrentTab().isIncognito();
}
mActivity.onShareMenuItemSelected(false, isIncognito);
+*/ mActivity.addOrEditBookmark(mActivity.getActivityTab());
};

mBottomControlsCoordinator = new BottomControlsCoordinator(mActivity.getFullscreenManager(),
@@ -1745,6 +1747,7 @@ public class ToolbarManager implements ScrimObserver, ToolbarTabController, UrlF
@@ -1772,6 +1774,7 @@ public class ToolbarManager implements ScrimObserver, ToolbarTabController, UrlF
boolean editingAllowed = currentTab == null || mBookmarkBridge == null
|| mBookmarkBridge.isEditBookmarksEnabled();
mToolbar.updateBookmarkButton(isBookmarked, editingAllowed);
@@ -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 7da0ae65235d35e1b36cd9c313a072e4b891ea95..5653441053f0c23dd7c5113fe58af48eb925138b 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 7da0ae65235d35e1b36cd9c313a072e4b891ea95..5653441053f0c23dd7c5113fe58af48e
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 7da0ae65235d35e1b36cd9c313a072e4b891ea95..5653441053f0c23dd7c5113fe58af48e
}

/**
@@ -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 7da0ae65235d35e1b36cd9c313a072e4b891ea95..5653441053f0c23dd7c5113fe58af48e
}

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,16 +1,16 @@
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java b/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
index a1fd6aced1b2dfe6eca978d1977517383913cd37..0482c54fb467960002133d7203a43e2ec6baf6d1 100644
index ead280c4712de8f3858d56cfb7536b4be6e1326f..590929cad423ae9c4a2ca89dd30fc0fcd52e554b 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
@@ -491,6 +491,7 @@ public class FeatureUtilities {
@@ -446,6 +446,7 @@ public class FeatureUtilities {
* @return Whether or not the bottom toolbar is enabled.
*/
public static boolean isBottomToolbarEnabled() {
+/*
if (sIsBottomToolbarEnabled == null) {
ChromePreferenceManager prefManager = ChromePreferenceManager.getInstance();

@@ -502,6 +503,7 @@ public class FeatureUtilities {
@@ -457,6 +458,7 @@ public class FeatureUtilities {
&& !DeviceFormFactor.isNonMultiDisplayContextOnTablet(
ContextUtils.getApplicationContext())
&& !isTabGroupsAndroidEnabled();
@@ -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
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.