Fix linking error
Other patch updates
This commit is contained in:
parent
afae804fdd
commit
47bef58cca
8 changed files with 109 additions and 38 deletions
|
@ -29,16 +29,11 @@ ungoogled-chromium-Disable-GCM.patch
|
|||
ungoogled-chromium-Disable-Gaia.patch
|
||||
ungoogled-chromium-Disable-domain-reliability.patch
|
||||
ungoogled-chromium-Disable-Network-Time-Tracker.patch
|
||||
ungoogled-chromium-Always-use-local-DevTools-files-instead-of-remote-files-from-Google.patch
|
||||
safe_browsing-disable-incident-reporting.patch
|
||||
safe_browsing-disable-reporting-of-safebrowsing-override.patch
|
||||
safe_browsing-disable-cookie-transmission.patch
|
||||
Disable-safe-browsing.patch
|
||||
Skip-the-first-run-and-metrics.patch
|
||||
Disable-all-promo-dialogs.patch
|
||||
Disable-sync-services-menu-entry.patch
|
||||
Remove-signin-and-data-saver-integrations.patch
|
||||
Remove-background-sync-and-translate-menu-options.patch
|
||||
Hide-passwords-manager-link.patch
|
||||
Disable-Omaha-update-checks.patch
|
||||
Disable-update-scheduler.patch
|
||||
|
@ -106,15 +101,12 @@ Disable-previews-by-default.patch
|
|||
Use-4-tile-rows-never-show-logo.patch
|
||||
Disable-metrics-collection-for-NTP-tiles.patch
|
||||
Enable-site-per-process-isolation-for-devices-with-enough-memory.patch
|
||||
Use-64-bit-WebView-processes.patch
|
||||
Add-option-to-use-home-page-as-NTP.patch
|
||||
Enable-night-mode-menu-entry-by-default.patch
|
||||
Disable-dynamic-module-loading.patch
|
||||
prefs-disable-signinallowed-by-default.patch
|
||||
prefs-always-prompt-for-download-directory-by-default.patch
|
||||
Disable-offline-pages-in-the-downloads-home-to-be-opened-in-CCT-by-default.patch
|
||||
Enable-changing-default-downloads-storage-location-by-default.patch
|
||||
Enable-download-rename-option-by-default.patch
|
||||
disable-payment-support-by-default.patch
|
||||
disable-background-sync-by-default.patch
|
||||
disable-sensors-access-site-setting-by-default.patch
|
||||
|
@ -139,9 +131,9 @@ Disable-password-reuse-detection-on-android.patch
|
|||
Allow-building-without-feed-support.patch
|
||||
Disable-addresses-autofill-by-default.patch
|
||||
Always-show-site-settings-for-cookies-javascript-and-ads.patch
|
||||
Automated-domain-substitution.patch
|
||||
Do-not-enable-QUIC-by-default.patch
|
||||
Restore-enable-horizontal-tab-switcher-flag.patch
|
||||
Use-a-minimum-DoH-timeout-of-400ms.patch
|
||||
Disable-DRM-media-origin-IDs-preprovisioning.patch
|
||||
Disable-smart-selection-by-default.patch
|
||||
Automated-domain-substitution.patch
|
||||
|
|
|
@ -61,7 +61,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
|
|||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacyPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacyPreferences.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacyPreferences.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacyPreferences.java
|
||||
@@ -42,6 +42,8 @@ public class PrivacyPreferences
|
||||
@@ -41,6 +41,8 @@ public class PrivacyPreferences
|
||||
|
||||
private ManagedPreferenceDelegate mManagedPreferenceDelegate;
|
||||
|
||||
|
@ -70,7 +70,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/privac
|
|||
@Override
|
||||
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
|
||||
SettingsUtils.addPreferencesFromResource(this, R.xml.privacy_preferences);
|
||||
@@ -77,6 +79,10 @@ public class PrivacyPreferences
|
||||
@@ -76,6 +78,10 @@ public class PrivacyPreferences
|
||||
Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
|
||||
} else if (PREF_NETWORK_PREDICTIONS.equals(key)) {
|
||||
PrivacyPreferencesManager.getInstance().setNetworkPredictionEnabled((boolean) newValue);
|
||||
|
@ -81,7 +81,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/privac
|
|||
} else if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
|
||||
PrefServiceBridge.getInstance().setBoolean(Pref.SEARCH_SUGGEST_ENABLED, (boolean) newValue);
|
||||
}
|
||||
@@ -112,6 +118,11 @@ public class PrivacyPreferences
|
||||
@@ -111,6 +117,11 @@ public class PrivacyPreferences
|
||||
prefServiceBridge.getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED));
|
||||
}
|
||||
|
||||
|
|
|
@ -72,7 +72,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/privac
|
|||
import org.chromium.base.BuildInfo;
|
||||
import org.chromium.chrome.R;
|
||||
import org.chromium.chrome.browser.ChromeFeatureList;
|
||||
@@ -37,6 +39,7 @@ public class PrivacyPreferences
|
||||
@@ -36,6 +38,7 @@ public class PrivacyPreferences
|
||||
private static final String PREF_SEARCH_SUGGESTIONS = "search_suggestions";
|
||||
private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";
|
||||
private static final String PREF_NETWORK_PREDICTIONS = "preload_pages";
|
||||
|
@ -80,7 +80,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/privac
|
|||
private static final String PREF_DO_NOT_TRACK = "do_not_track";
|
||||
private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";
|
||||
|
||||
@@ -85,6 +88,10 @@ public class PrivacyPreferences
|
||||
@@ -84,6 +87,10 @@ public class PrivacyPreferences
|
||||
sharedPreferencesEditor.apply();
|
||||
} else if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
|
||||
PrefServiceBridge.getInstance().setBoolean(Pref.SEARCH_SUGGEST_ENABLED, (boolean) newValue);
|
||||
|
@ -91,7 +91,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/privac
|
|||
}
|
||||
|
||||
return true;
|
||||
@@ -129,6 +136,11 @@ public class PrivacyPreferences
|
||||
@@ -128,6 +135,11 @@ public class PrivacyPreferences
|
||||
? R.string.text_on
|
||||
: R.string.text_off);
|
||||
}
|
||||
|
|
|
@ -25,7 +25,7 @@ Subject: Add user setting for DNS-over-HTTPS (DoH) custom URL
|
|||
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
|
||||
--- a/chrome/android/chrome_java_sources.gni
|
||||
+++ b/chrome/android/chrome_java_sources.gni
|
||||
@@ -1336,6 +1336,8 @@ chrome_java_sources = [
|
||||
@@ -1335,6 +1335,8 @@ chrome_java_sources = [
|
||||
"java/src/org/chromium/chrome/browser/settings/ChromeSwitchPreference.java",
|
||||
"java/src/org/chromium/chrome/browser/settings/ClearBrowsingDataCheckBoxPreference.java",
|
||||
"java/src/org/chromium/chrome/browser/settings/ExpandablePreferenceGroup.java",
|
||||
|
|
|
@ -6,17 +6,20 @@ Originally based on ungoogled-chromium patch
|
|||
Contains Android-specific fixes to remove Safe Browsing
|
||||
Disable CrowdDeny feature
|
||||
---
|
||||
chrome/android/BUILD.gn | 1 -
|
||||
chrome/android/chrome_java_sources.gni | 1 -
|
||||
.../java/res/xml/privacy_preferences.xml | 21 -----
|
||||
.../res/xml/sync_and_services_preferences.xml | 20 -----
|
||||
.../settings/privacy/PrivacyPreferences.java | 77 -------------------
|
||||
.../browser/webshare/ShareServiceImpl.java | 5 --
|
||||
.../settings/privacy/PrivacyPreferences.java | 78 -------------------
|
||||
.../sync/SyncAndServicesPreferences.java | 7 +-
|
||||
.../browser/webshare/ShareServiceImpl.java | 6 --
|
||||
chrome/browser/BUILD.gn | 4 -
|
||||
chrome/browser/about_flags.cc | 2 +-
|
||||
chrome/browser/browser_process.h | 16 ----
|
||||
chrome/browser/browser_process_impl.cc | 36 ---------
|
||||
chrome/browser/browser_process_impl.h | 6 --
|
||||
.../chrome_browsing_data_remover_delegate.cc | 41 ----------
|
||||
.../browser/chrome_content_browser_client.cc | 60 ++++-----------
|
||||
.../browser/chrome_content_browser_client.cc | 60 ++++----------
|
||||
.../file_type_policies_component_installer.cc | 16 +---
|
||||
.../chrome_download_manager_delegate.cc | 31 +++-----
|
||||
.../chrome_download_manager_delegate.h | 8 +-
|
||||
|
@ -57,8 +60,30 @@ Disable CrowdDeny feature
|
|||
.../native_file_system_file_writer_impl.cc | 48 +-----------
|
||||
.../native_file_system_file_writer_impl.h | 15 +---
|
||||
.../native_file_system_permission_context.h | 7 --
|
||||
51 files changed, 151 insertions(+), 639 deletions(-)
|
||||
54 files changed, 153 insertions(+), 648 deletions(-)
|
||||
|
||||
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
||||
--- a/chrome/android/BUILD.gn
|
||||
+++ b/chrome/android/BUILD.gn
|
||||
@@ -2780,7 +2780,6 @@ generate_jni("chrome_jni_headers") {
|
||||
"java/src/org/chromium/chrome/browser/rappor/RapporServiceBridge.java",
|
||||
"java/src/org/chromium/chrome/browser/rlz/RevenueStats.java",
|
||||
"java/src/org/chromium/chrome/browser/rlz/RlzPingHandler.java",
|
||||
- "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingBridge.java",
|
||||
"java/src/org/chromium/chrome/browser/search_engines/TemplateUrlServiceFactory.java",
|
||||
"java/src/org/chromium/chrome/browser/send_tab_to_self/NotificationManager.java",
|
||||
"java/src/org/chromium/chrome/browser/send_tab_to_self/SendTabToSelfAndroidBridge.java",
|
||||
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
|
||||
--- a/chrome/android/chrome_java_sources.gni
|
||||
+++ b/chrome/android/chrome_java_sources.gni
|
||||
@@ -1315,7 +1315,6 @@ chrome_java_sources = [
|
||||
"java/src/org/chromium/chrome/browser/rappor/RapporServiceBridge.java",
|
||||
"java/src/org/chromium/chrome/browser/rlz/RevenueStats.java",
|
||||
"java/src/org/chromium/chrome/browser/rlz/RlzPingHandler.java",
|
||||
- "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingBridge.java",
|
||||
"java/src/org/chromium/chrome/browser/search_engines/SearchEngineChoiceMetrics.java",
|
||||
"java/src/org/chromium/chrome/browser/search_engines/SearchEngineChoiceNotification.java",
|
||||
"java/src/org/chromium/chrome/browser/search_engines/TemplateUrlServiceFactory.java",
|
||||
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
|
||||
|
@ -139,7 +164,15 @@ diff --git a/chrome/android/java/res/xml/sync_and_services_preferences.xml b/chr
|
|||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacyPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacyPreferences.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacyPreferences.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacyPreferences.java
|
||||
@@ -35,11 +35,7 @@ import org.chromium.ui.text.SpanApplier;
|
||||
@@ -20,7 +20,6 @@ import org.chromium.chrome.browser.help.HelpAndFeedback;
|
||||
import org.chromium.chrome.browser.preferences.Pref;
|
||||
import org.chromium.chrome.browser.preferences.PrefServiceBridge;
|
||||
import org.chromium.chrome.browser.profiles.Profile;
|
||||
-import org.chromium.chrome.browser.safe_browsing.SafeBrowsingBridge;
|
||||
import org.chromium.chrome.browser.settings.ChromeBaseCheckBoxPreference;
|
||||
import org.chromium.chrome.browser.settings.ManagedPreferenceDelegate;
|
||||
import org.chromium.chrome.browser.settings.PreferencesLauncher;
|
||||
@@ -35,11 +34,7 @@ import org.chromium.ui.text.SpanApplier;
|
||||
*/
|
||||
public class PrivacyPreferences
|
||||
extends PreferenceFragmentCompat implements Preference.OnPreferenceChangeListener {
|
||||
|
@ -151,7 +184,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/privac
|
|||
private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";
|
||||
private static final String PREF_NETWORK_PREDICTIONS = "preload_pages";
|
||||
private static final String PREF_DO_NOT_TRACK = "do_not_track";
|
||||
@@ -47,7 +43,6 @@ public class PrivacyPreferences
|
||||
@@ -47,7 +42,6 @@ public class PrivacyPreferences
|
||||
private static final String PREF_SYNC_AND_SERVICES_LINK_DIVIDER =
|
||||
"sync_and_services_link_divider";
|
||||
private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link";
|
||||
|
@ -159,7 +192,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/privac
|
|||
|
||||
private ManagedPreferenceDelegate mManagedPreferenceDelegate;
|
||||
|
||||
@@ -73,28 +68,11 @@ public class PrivacyPreferences
|
||||
@@ -73,28 +67,11 @@ public class PrivacyPreferences
|
||||
getPreferenceScreen().removePreference(findPreference(PREF_SYNC_AND_SERVICES_LINK_DIVIDER));
|
||||
getPreferenceScreen().removePreference(findPreference(PREF_SYNC_AND_SERVICES_LINK));
|
||||
|
||||
|
@ -188,7 +221,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/privac
|
|||
updateSummaries();
|
||||
}
|
||||
|
||||
@@ -108,13 +86,6 @@ public class PrivacyPreferences
|
||||
@@ -108,13 +85,6 @@ public class PrivacyPreferences
|
||||
PrivacyPreferencesManager.getInstance().setNetworkPredictionEnabled((boolean) newValue);
|
||||
} else if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
|
||||
PrefServiceBridge.getInstance().setBoolean(Pref.SEARCH_SUGGEST_ENABLED, (boolean) newValue);
|
||||
|
@ -202,7 +235,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/privac
|
|||
}
|
||||
|
||||
return true;
|
||||
@@ -135,32 +106,12 @@ public class PrivacyPreferences
|
||||
@@ -135,32 +105,12 @@ public class PrivacyPreferences
|
||||
CharSequence textOn = getActivity().getResources().getText(R.string.text_on);
|
||||
CharSequence textOff = getActivity().getResources().getText(R.string.text_off);
|
||||
|
||||
|
@ -235,7 +268,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/privac
|
|||
CheckBoxPreference canMakePaymentPref =
|
||||
(CheckBoxPreference) findPreference(PREF_CAN_MAKE_PAYMENT);
|
||||
if (canMakePaymentPref != null) {
|
||||
@@ -174,42 +125,14 @@ public class PrivacyPreferences
|
||||
@@ -174,42 +124,14 @@ public class PrivacyPreferences
|
||||
? R.string.text_on
|
||||
: R.string.text_off);
|
||||
}
|
||||
|
@ -278,10 +311,56 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/privac
|
|||
if (PREF_NETWORK_PREDICTIONS.equals(key)) {
|
||||
return PrivacyPreferencesManager.getInstance().isNetworkPredictionManaged();
|
||||
}
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/sync/SyncAndServicesPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/sync/SyncAndServicesPreferences.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/sync/SyncAndServicesPreferences.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/sync/SyncAndServicesPreferences.java
|
||||
@@ -45,7 +45,6 @@ import org.chromium.chrome.browser.metrics.UmaSessionStats;
|
||||
import org.chromium.chrome.browser.preferences.Pref;
|
||||
import org.chromium.chrome.browser.preferences.PrefServiceBridge;
|
||||
import org.chromium.chrome.browser.profiles.Profile;
|
||||
-import org.chromium.chrome.browser.safe_browsing.SafeBrowsingBridge;
|
||||
import org.chromium.chrome.browser.settings.ChromeBasePreference;
|
||||
import org.chromium.chrome.browser.settings.ChromeSwitchPreference;
|
||||
import org.chromium.chrome.browser.settings.ManagedPreferenceDelegate;
|
||||
@@ -375,7 +374,6 @@ public class SyncAndServicesPreferences extends PreferenceFragmentCompat
|
||||
mPrefServiceBridge.setBoolean(
|
||||
Pref.PASSWORD_MANAGER_LEAK_DETECTION_ENABLED, (boolean) newValue);
|
||||
} else if (PREF_SAFE_BROWSING_SCOUT_REPORTING.equals(key)) {
|
||||
- SafeBrowsingBridge.setSafeBrowsingExtendedReportingEnabled((boolean) newValue);
|
||||
} else if (PREF_NAVIGATION_ERROR.equals(key)) {
|
||||
mPrefServiceBridge.setBoolean(Pref.ALTERNATE_ERROR_PAGES_ENABLED, (boolean) newValue);
|
||||
} else if (PREF_USAGE_AND_CRASH_REPORTING.equals(key)) {
|
||||
@@ -669,8 +667,7 @@ public class SyncAndServicesPreferences extends PreferenceFragmentCompat
|
||||
private void updateLeakDetectionAndSafeBrowsingReportingPreferences() {
|
||||
boolean safe_browsing_enabled = mPrefServiceBridge.getBoolean(Pref.SAFE_BROWSING_ENABLED);
|
||||
mSafeBrowsingReporting.setEnabled(safe_browsing_enabled);
|
||||
- mSafeBrowsingReporting.setChecked(safe_browsing_enabled
|
||||
- && SafeBrowsingBridge.isSafeBrowsingExtendedReportingEnabled());
|
||||
+ mSafeBrowsingReporting.setChecked(safe_browsing_enabled);
|
||||
|
||||
if (mPasswordLeakDetection == null) return; // Early exit without leak detection to update.
|
||||
|
||||
@@ -700,7 +697,7 @@ public class SyncAndServicesPreferences extends PreferenceFragmentCompat
|
||||
return mPrefServiceBridge.isManagedPreference(Pref.SEARCH_SUGGEST_ENABLED);
|
||||
}
|
||||
if (PREF_SAFE_BROWSING_SCOUT_REPORTING.equals(key)) {
|
||||
- return SafeBrowsingBridge.isSafeBrowsingExtendedReportingManaged();
|
||||
+ return false;
|
||||
}
|
||||
if (PREF_SAFE_BROWSING.equals(key)) {
|
||||
return mPrefServiceBridge.isManagedPreference(Pref.SAFE_BROWSING_ENABLED);
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webshare/ShareServiceImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/webshare/ShareServiceImpl.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/webshare/ShareServiceImpl.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/webshare/ShareServiceImpl.java
|
||||
@@ -196,11 +196,6 @@ public class ShareServiceImpl implements ShareService {
|
||||
@@ -20,7 +20,6 @@ import org.chromium.base.task.PostTask;
|
||||
import org.chromium.base.task.TaskRunner;
|
||||
import org.chromium.base.task.TaskTraits;
|
||||
import org.chromium.chrome.browser.ChromeActivity;
|
||||
-import org.chromium.chrome.browser.safe_browsing.SafeBrowsingBridge;
|
||||
import org.chromium.chrome.browser.share.ShareHelper;
|
||||
import org.chromium.chrome.browser.share.ShareParams;
|
||||
import org.chromium.content_public.browser.WebContents;
|
||||
@@ -196,11 +195,6 @@ public class ShareServiceImpl implements ShareService {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
@ -459,7 +459,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/datare
|
|||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacyPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacyPreferences.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacyPreferences.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacyPreferences.java
|
||||
@@ -25,7 +25,6 @@ import org.chromium.chrome.browser.settings.ChromeBaseCheckBoxPreference;
|
||||
@@ -24,7 +24,6 @@ import org.chromium.chrome.browser.settings.ChromeBaseCheckBoxPreference;
|
||||
import org.chromium.chrome.browser.settings.ManagedPreferenceDelegate;
|
||||
import org.chromium.chrome.browser.settings.PreferencesLauncher;
|
||||
import org.chromium.chrome.browser.settings.SettingsUtils;
|
||||
|
@ -467,7 +467,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/privac
|
|||
import org.chromium.chrome.browser.usage_stats.UsageStatsConsentDialog;
|
||||
import org.chromium.ui.text.NoUnderlineClickableSpan;
|
||||
import org.chromium.ui.text.SpanApplier;
|
||||
@@ -40,9 +39,6 @@ public class PrivacyPreferences
|
||||
@@ -39,9 +38,6 @@ public class PrivacyPreferences
|
||||
private static final String PREF_NETWORK_PREDICTIONS = "preload_pages";
|
||||
private static final String PREF_DO_NOT_TRACK = "do_not_track";
|
||||
private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";
|
||||
|
@ -477,7 +477,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/privac
|
|||
|
||||
private ManagedPreferenceDelegate mManagedPreferenceDelegate;
|
||||
|
||||
@@ -65,9 +61,6 @@ public class PrivacyPreferences
|
||||
@@ -64,9 +60,6 @@ public class PrivacyPreferences
|
||||
networkPredictionPref.setOnPreferenceChangeListener(this);
|
||||
networkPredictionPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
|
||||
|
||||
|
@ -490,7 +490,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/privac
|
|||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/sync/SyncAndServicesPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/sync/SyncAndServicesPreferences.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/sync/SyncAndServicesPreferences.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/sync/SyncAndServicesPreferences.java
|
||||
@@ -176,15 +176,7 @@ public class SyncAndServicesPreferences extends PreferenceFragmentCompat
|
||||
@@ -175,15 +175,7 @@ public class SyncAndServicesPreferences extends PreferenceFragmentCompat
|
||||
|
||||
mPrivacyPrefManager.migrateNetworkPredictionPreferences();
|
||||
|
||||
|
|
|
@ -43,7 +43,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
|
|||
"java/src/org/chromium/chrome/browser/ChromeBackupAgent.java",
|
||||
"java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java",
|
||||
"java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java",
|
||||
@@ -1340,11 +1339,6 @@ chrome_java_sources = [
|
||||
@@ -1339,11 +1338,6 @@ chrome_java_sources = [
|
||||
"java/src/org/chromium/chrome/browser/services/AndroidEduAndChildAccountHelper.java",
|
||||
"java/src/org/chromium/chrome/browser/services/AndroidEduOwnerCheckCallback.java",
|
||||
"java/src/org/chromium/chrome/browser/services/GoogleServicesManager.java",
|
||||
|
|
|
@ -5,9 +5,9 @@ Subject: openH264: enable ARM/ARM64 optimizations
|
|||
Enable the optimizations not only for ChromeOS but for all compatbile ARM/ARM64 architectures
|
||||
Limit threads auto-detect only for iOS
|
||||
---
|
||||
.../modules/mediarecorder/h264_encoder.cc | 6 ++--
|
||||
third_party/openh264/BUILD.gn | 31 ++++++++++++++-----
|
||||
2 files changed, 27 insertions(+), 10 deletions(-)
|
||||
.../modules/mediarecorder/h264_encoder.cc | 6 ++---
|
||||
third_party/openh264/BUILD.gn | 24 ++++++++++++++-----
|
||||
2 files changed, 21 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc b/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc
|
||||
--- a/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc
|
||||
|
@ -30,7 +30,7 @@ diff --git a/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc b/
|
|||
diff --git a/third_party/openh264/BUILD.gn b/third_party/openh264/BUILD.gn
|
||||
--- a/third_party/openh264/BUILD.gn
|
||||
+++ b/third_party/openh264/BUILD.gn
|
||||
@@ -125,8 +130,12 @@ if (use_assembler) {
|
||||
@@ -125,8 +125,12 @@ if (use_assembler) {
|
||||
|
||||
source_set("common") {
|
||||
sources = openh264_common_sources
|
||||
|
@ -45,7 +45,7 @@ diff --git a/third_party/openh264/BUILD.gn b/third_party/openh264/BUILD.gn
|
|||
}
|
||||
include_dirs = openh264_common_include_dirs
|
||||
|
||||
@@ -151,8 +160,12 @@ source_set("common") {
|
||||
@@ -151,8 +155,12 @@ source_set("common") {
|
||||
|
||||
source_set("processing") {
|
||||
sources = openh264_processing_sources
|
||||
|
@ -60,7 +60,7 @@ diff --git a/third_party/openh264/BUILD.gn b/third_party/openh264/BUILD.gn
|
|||
}
|
||||
include_dirs = openh264_processing_include_dirs
|
||||
|
||||
@@ -170,8 +183,12 @@ source_set("processing") {
|
||||
@@ -170,8 +178,12 @@ source_set("processing") {
|
||||
|
||||
source_set("encoder") {
|
||||
sources = openh264_encoder_sources
|
||||
|
|
Loading…
Add table
Reference in a new issue