Patches for 134 (no changes)
This commit is contained in:
@@ -1327,7 +1327,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
|
||||
#include "chrome/browser/bookmarks/bookmark_model_factory.h"
|
||||
#include "chrome/browser/bookmarks/managed_bookmark_service_factory.h"
|
||||
#include "chrome/browser/commerce/shopping_service_factory.h"
|
||||
@@ -249,6 +250,12 @@ ScopedJavaLocalRef<jobject> JNI_BookmarkBridge_NativeGetForProfile(
|
||||
@@ -215,6 +216,12 @@ ScopedJavaLocalRef<jobject> JNI_BookmarkBridge_NativeGetForProfile(
|
||||
if (!profile)
|
||||
return nullptr;
|
||||
|
||||
|
||||
@@ -69,7 +69,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
|
||||
diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
|
||||
--- a/chrome/android/java/res/xml/privacy_preferences.xml
|
||||
+++ b/chrome/android/java/res/xml/privacy_preferences.xml
|
||||
@@ -72,6 +72,11 @@ found in the LICENSE file.
|
||||
@@ -77,6 +77,11 @@ found in the LICENSE file.
|
||||
android:title="@string/open_external_links_incognito_title"
|
||||
android:summary="@string/open_external_links_incognito_summary"
|
||||
android:defaultValue="false" />
|
||||
@@ -92,7 +92,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
|
||||
import org.chromium.chrome.browser.profiles.Profile;
|
||||
import org.chromium.chrome.browser.profiles.ProfileManager;
|
||||
import org.chromium.chrome.browser.profiles.ProfileProvider;
|
||||
@@ -615,7 +616,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
|
||||
@@ -612,7 +613,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
|
||||
new TabContentManager(
|
||||
this,
|
||||
mBrowserControlsManagerSupplier.get(),
|
||||
|
||||
@@ -272,10 +272,10 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
|
||||
Preference captions = findPreference(PREF_CAPTIONS);
|
||||
captions.setOnPreferenceClickListener(
|
||||
preference -> {
|
||||
@@ -213,6 +222,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
|
||||
mDelegate.requestRestart(getActivity());
|
||||
@@ -214,6 +223,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
|
||||
} else if (PREF_DISABLE_TOOLBAR_SWIPE_UP.equals(preference.getKey())) {
|
||||
mDisableToolbarSwipeUpDelegate.setValue((Boolean) newValue);
|
||||
mDelegate.requestRestart(getActivity());
|
||||
+ } else if (PREF_ALWAYS_SHOW_CONTEXTMENU_ON_LINKS.equals(preference.getKey())) {
|
||||
+ mShowAlwaysContextMenuOnLinksDelegate.setValue((Boolean) newValue);
|
||||
+ mDelegate.requestRestart(getActivity());
|
||||
|
||||
@@ -92,7 +92,7 @@ diff --git a/chrome/android/java/res/xml/developer_preferences.xml b/chrome/andr
|
||||
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||||
--- a/chrome/browser/BUILD.gn
|
||||
+++ b/chrome/browser/BUILD.gn
|
||||
@@ -7647,6 +7647,13 @@ static_library("browser") {
|
||||
@@ -7648,6 +7648,13 @@ static_library("browser") {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
|
||||
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||||
--- a/chrome/browser/BUILD.gn
|
||||
+++ b/chrome/browser/BUILD.gn
|
||||
@@ -8150,6 +8150,12 @@ static_library("browser") {
|
||||
@@ -8151,6 +8151,12 @@ static_library("browser") {
|
||||
deps += [ "//components/segmentation_platform/internal:optimization_guide_segmentation_handler" ]
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||||
if (enable_compose) {
|
||||
sources += [
|
||||
"compose/chrome_compose_client.cc",
|
||||
@@ -8165,7 +8171,6 @@ static_library("browser") {
|
||||
@@ -8166,7 +8172,6 @@ static_library("browser") {
|
||||
]
|
||||
|
||||
deps += [
|
||||
@@ -34,7 +34,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||||
"//chrome/common/compose",
|
||||
"//chrome/common/compose:mojo_bindings",
|
||||
"//components/autofill/content/browser:browser",
|
||||
@@ -8608,7 +8613,7 @@ source_set("font_pref") {
|
||||
@@ -8609,7 +8614,7 @@ source_set("font_pref") {
|
||||
deps = [ "//chrome/common" ]
|
||||
}
|
||||
|
||||
|
||||
@@ -103,7 +103,7 @@ new file mode 100644
|
||||
diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
|
||||
--- a/chrome/android/java/res/xml/privacy_preferences.xml
|
||||
+++ b/chrome/android/java/res/xml/privacy_preferences.xml
|
||||
@@ -53,6 +53,10 @@ found in the LICENSE file.
|
||||
@@ -58,6 +58,10 @@ found in the LICENSE file.
|
||||
android:key="do_not_track"
|
||||
android:title="@string/do_not_track_title"
|
||||
android:fragment="org.chromium.chrome.browser.privacy.settings.DoNotTrackSettings" />
|
||||
@@ -596,7 +596,7 @@ diff --git a/content/browser/loader/browser_initiated_resource_request.cc b/cont
|
||||
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
||||
--- a/content/renderer/render_frame_impl.cc
|
||||
+++ b/content/renderer/render_frame_impl.cc
|
||||
@@ -4588,6 +4588,10 @@ void RenderFrameImpl::FinalizeRequestInternal(
|
||||
@@ -4589,6 +4589,10 @@ void RenderFrameImpl::FinalizeRequestInternal(
|
||||
request.SetHttpHeaderField(
|
||||
blink::WebString::FromUTF8(blink::kDoNotTrackHeader), "1");
|
||||
}
|
||||
|
||||
@@ -59,7 +59,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
|
||||
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||||
--- a/chrome/browser/BUILD.gn
|
||||
+++ b/chrome/browser/BUILD.gn
|
||||
@@ -2443,6 +2443,7 @@ static_library("browser") {
|
||||
@@ -2444,6 +2444,7 @@ static_library("browser") {
|
||||
"//third_party/ungoogled:switches",
|
||||
"//services/device/public/mojom",
|
||||
"//services/device/public/mojom:usb",
|
||||
|
||||
@@ -45,7 +45,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
|
||||
diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
|
||||
--- a/chrome/android/java/res/xml/privacy_preferences.xml
|
||||
+++ b/chrome/android/java/res/xml/privacy_preferences.xml
|
||||
@@ -93,6 +93,12 @@ found in the LICENSE file.
|
||||
@@ -98,6 +98,12 @@ found in the LICENSE file.
|
||||
android:summary="@string/allow_external_intent_requests_summary"
|
||||
app:featureName="AllowExternalIntentRequests"
|
||||
app:needRestart="false" />
|
||||
|
||||
Reference in New Issue
Block a user