Patches for v145 (de48f820) · Commits · e / os / cromite

build/patches/Experimental-support-for-extensions-on-Android.patch

+14 −1

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
	base/android/device_info.cc \| 8 ++-		base/android/device_info.cc \| 8 ++-
	base/android/device_info.h \| 3 +-		base/android/device_info.h \| 3 +-
	.../src/org/chromium/base/DeviceInfo.java \| 6 +-		.../src/org/chromium/base/DeviceInfo.java \| 6 +-
			.../base/test/util/ApplicationTestUtils.java \| 2 +-
	build/BUILD.gn \| 2 +-		build/BUILD.gn \| 2 +-
	build/config/android/rules.gni \| 4 +-		build/config/android/rules.gni \| 4 +-
	build/config/chrome_build.gni \| 7 +-		build/config/chrome_build.gni \| 7 +-
	@@ -179,7 +180,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
	ui/webui/resources/cr_elements/BUILD.gn \| 2 +-		ui/webui/resources/cr_elements/BUILD.gn \| 2 +-
	.../cr_elements/cr_toolbar/cr_toolbar.css \| 6 ++		.../cr_elements/cr_toolbar/cr_toolbar.css \| 6 ++
	ui/webui/resources/css/BUILD.gn \| 2 +-		ui/webui/resources/css/BUILD.gn \| 2 +-
	167 files changed, 584 insertions(+), 304 deletions(-)		168 files changed, 585 insertions(+), 305 deletions(-)
	create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Enable-extensions-Android.grdp		create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Enable-extensions-Android.grdp
	create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Extensions-Android.grdp		create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Extensions-Android.grdp
	create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Extensions-Android.inc		create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Extensions-Android.inc
	@@ -256,6 +257,18 @@ diff --git a/base/android/java/src/org/chromium/base/DeviceInfo.java b/base/andr
	public static int getVulkanDeqpLevel() {		public static int getVulkanDeqpLevel() {
	return getInstance().mIDeviceInfo.vulkanDeqpLevel;		return getInstance().mIDeviceInfo.vulkanDeqpLevel;
	}		}
			diff --git a/base/test/android/javatests/src/org/chromium/base/test/util/ApplicationTestUtils.java b/base/test/android/javatests/src/org/chromium/base/test/util/ApplicationTestUtils.java
			--- a/base/test/android/javatests/src/org/chromium/base/test/util/ApplicationTestUtils.java
			+++ b/base/test/android/javatests/src/org/chromium/base/test/util/ApplicationTestUtils.java
			@@ -167,7 +167,7 @@ public class ApplicationTestUtils {
			// called, it is just the notification to the test instrumentation that is
			// missing. PersistAcrossReboots is currently only enabled on desktop builds.
			boolean hasSkippedOnCreate =
			- DeviceInfo.isDesktop()
			+ DeviceInfo.isDesktopFalse()
			&& !hadOnCreateCall.get()
			&& (newStage == Stage.STARTED)
			&& stages.contains(Stage.CREATED);
	diff --git a/build/BUILD.gn b/build/BUILD.gn		diff --git a/build/BUILD.gn b/build/BUILD.gn
	--- a/build/BUILD.gn		--- a/build/BUILD.gn
	+++ b/build/BUILD.gn		+++ b/build/BUILD.gn

build/patches/Move-navigation-bar-to-bottom.patch

+7 −4

build/patches/User-agent-customization.patch

+1 −14

Original line number	Original line	Diff line number	Diff line
	@@ -10,7 +10,6 @@ whereas the content setting is intended for use in a specific site.
	Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html		Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
	License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html		License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
	---		---
	.../browser/aw_content_browser_client.cc \| 2 +-
	base/base_switches.cc \| 2 +		base/base_switches.cc \| 2 +
	base/base_switches.h \| 2 +		base/base_switches.h \| 2 +
	chrome/android/chrome_java_resources.gni \| 2 +		chrome/android/chrome_java_resources.gni \| 2 +
	@@ -46,25 +45,13 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
	.../browser/web_contents/web_contents_impl.cc \| 6 +-		.../browser/web_contents/web_contents_impl.cc \| 6 +-
	.../framehost/NavigationControllerImpl.java \| 17 +-		.../framehost/NavigationControllerImpl.java \| 17 +-
	content/renderer/render_thread_impl.cc \| 1 -		content/renderer/render_thread_impl.cc \| 1 -
	36 files changed, 808 insertions(+), 25 deletions(-)		35 files changed, 807 insertions(+), 24 deletions(-)
	create mode 100644 chrome/android/java/res/layout/custom_useragent_preferences.xml		create mode 100644 chrome/android/java/res/layout/custom_useragent_preferences.xml
	create mode 100644 chrome/android/java/res/xml/useragent_preferences.xml		create mode 100644 chrome/android/java/res/xml/useragent_preferences.xml
	create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/settings/UserAgentPreferences.java		create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/settings/UserAgentPreferences.java
	create mode 100644 components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/impl/BromiteRequestDesktopSiteContentSetting.java		create mode 100644 components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/impl/BromiteRequestDesktopSiteContentSetting.java
	create mode 100644 components/browser_ui/strings/bromite_content_settings/request_desktop_site.grdp		create mode 100644 components/browser_ui/strings/bromite_content_settings/request_desktop_site.grdp

	diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc
	--- a/android_webview/browser/aw_content_browser_client.cc
	+++ b/android_webview/browser/aw_content_browser_client.cc
	@@ -201,7 +201,7 @@ base::WeakPtr<AsyncCheckTracker> GetAsyncCheckTracker(
	} // anonymous namespace

	std::string GetProduct() {
	- return embedder_support::GetProductAndVersion();
	+ return embedder_support::GetProductAndVersion(embedder_support::UserAgentReductionEnterprisePolicyState::kForceEnabled);
	}

	std::string GetUserAgent() {
	diff --git a/base/base_switches.cc b/base/base_switches.cc		diff --git a/base/base_switches.cc b/base/base_switches.cc
	--- a/base/base_switches.cc		--- a/base/base_switches.cc
	+++ b/base/base_switches.cc		+++ b/base/base_switches.cc

Original line number	Original line	Diff line number	Diff line
	@@ -89,7 +89,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
	.../toolbar/ToolbarLongPressMenuHandler.java \| 8 -		.../toolbar/ToolbarLongPressMenuHandler.java \| 8 -
	.../bottom/BottomControlsContentDelegate.java \| 12 +-		.../bottom/BottomControlsContentDelegate.java \| 12 +-
	.../bottom/BottomControlsCoordinator.java \| 11 +-		.../bottom/BottomControlsCoordinator.java \| 11 +-
	.../bottom/BottomControlsMediator.java \| 32 +++-		.../bottom/BottomControlsMediator.java \| 35 ++++-
	.../bottom/BottomControlsProperties.java \| 6 +-		.../bottom/BottomControlsProperties.java \| 6 +-
	.../bottom/BottomControlsViewBinder.java \| 2 +		.../bottom/BottomControlsViewBinder.java \| 2 +
	.../bottom/ScrollingBottomViewSceneLayer.java \| 19 ++-		.../bottom/ScrollingBottomViewSceneLayer.java \| 19 ++-
	@@ -104,7 +104,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
	.../render_widget_host_view_android.cc \| 3 +		.../render_widget_host_view_android.cc \| 3 +
	.../Move-navigation-bar-to-bottom.inc \| 17 ++		.../Move-navigation-bar-to-bottom.inc \| 17 ++
	.../renderer/core/frame/viewport_data.cc \| 1 +		.../renderer/core/frame/viewport_data.cc \| 1 +
	91 files changed, 1064 insertions(+), 88 deletions(-)		91 files changed, 1067 insertions(+), 88 deletions(-)
	create mode 100644 chrome/browser/hub/internal/android/java/src/org/chromium/chrome/browser/hub/ReversedLinearLayout.java		create mode 100644 chrome/browser/hub/internal/android/java/src/org/chromium/chrome/browser/hub/ReversedLinearLayout.java
	create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Move-navigation-bar-to-bottom.inc		create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Move-navigation-bar-to-bottom.inc

	@@ -2844,7 +2844,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
	mIsBottomControlsVisible = visible;		mIsBottomControlsVisible = visible;
	updateCompositedViewVisibility();		updateCompositedViewVisibility();
	updateAndroidViewVisibility();		updateAndroidViewVisibility();
	@@ -183,6 +190,19 @@ class BottomControlsMediator		@@ -183,6 +190,22 @@ class BottomControlsMediator
	mTabObscuringHandler.removeObserver(this);		mTabObscuringHandler.removeObserver(this);
	}		}

	@@ -2859,12 +2859,15 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
	+ boolean requestNewFrame,		+ boolean requestNewFrame,
	+ boolean isVisibilityForced) {		+ boolean isVisibilityForced) {
	+ mModel.set(BottomControlsProperties.TOPCONTROLSMINHEIGHT_OFFSET, topControlsMinHeightOffset);		+ mModel.set(BottomControlsProperties.TOPCONTROLSMINHEIGHT_OFFSET, topControlsMinHeightOffset);
			+ if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
			+ mModel.set(BottomControlsProperties.Y_OFFSET, -topOffset);
			+ }
	+ }		+ }
	+		+
	@Override		@Override
	public void onBottomControlsHeightChanged(		public void onBottomControlsHeightChanged(
	int bottomControlsHeight, int bottomControlsMinHeight) {		int bottomControlsHeight, int bottomControlsMinHeight) {
	@@ -272,11 +292,13 @@ class BottomControlsMediator		@@ -272,11 +295,13 @@ class BottomControlsMediator
	&& !mIsInSwipeLayout		&& !mIsInSwipeLayout
	&& getBrowserControls().getBottomControlOffset() == 0;		&& getBrowserControls().getBottomControlOffset() == 0;
	if (visible) {		if (visible) {