0ct0pu5/bromite
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Release 77.0.3865.104

Browse source
This commit is contained in:
csagan5 2019-09-28 09:55:06 +02:00
parent 74cb09ea83
commit 8d494540e2
No known key found for this signature in database
GPG key ID: 64190A51D85DC0C5
20 changed files with 2796 additions and 665 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -1,3 +1,7 @@
# 77.0.3865.104
* revert upstream commit for search privacy options and related translations removal (fixes https://github.com/bromite/bromite/issues/375)
* remove unused patch for enabling subresource filter on all sites
# 77.0.3865.95
# 77.0.3865.81

761
build/filters/adblock_entries.h
View file

File diff suppressed because one or more lines are too long

4
build/patches/Add-a-proxy-configuration-page.patch
View file

@ -58,8 +58,8 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
+ android:title="@string/proxy_title"
+ app:url="@string/proxy_url" />
<org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreferenceCompat
android:key="can_make_payment"
android:title="@string/can_make_payment_title"
android:key="search_suggestions"
android:title="@string/search_suggestions_title"
diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
--- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
+++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc

2
build/patches/Add-an-always-incognito-mode.patch
View file

@ -296,7 +296,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
--- a/chrome/android/java/strings/android_chrome_strings.grd
+++ b/chrome/android/java/strings/android_chrome_strings.grd
@@ -692,6 +692,14 @@ CHAR-LIMIT guidelines:
@@ -674,6 +674,14 @@ CHAR-LIMIT guidelines:
Search and site suggestions disabled
</message>

32
build/patches/Add-custom-tab-intents-privacy-option.patch
View file

@ -26,18 +26,18 @@ diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res
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
@@ -15,6 +15,11 @@
android:title="@string/preload_pages_title"
android:summary="@string/preload_pages_summary"
android:persistent="false" />
@@ -23,6 +23,11 @@
android:key="contextual_search"
android:title="@string/contextual_search_title"
android:fragment="org.chromium.chrome.browser.preferences.privacy.ContextualSearchPreferenceFragment" />
+ <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreferenceCompat
+ android:key="allow_custom_tab_intents"
+ android:title="@string/allow_custom_tab_intents_title"
+ android:summary="@string/allow_custom_tab_intents_summary"
+ android:defaultValue="false" />
<org.chromium.chrome.browser.preferences.ChromeBasePreferenceCompat
android:key="usage_stats_reporting"
android:title="@string/usage_stats_setting_title"
<android.support.v7.preference.Preference
android:key="clear_browsing_data"
android:title="@string/clear_browsing_data_title"
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
@ -60,7 +60,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
@@ -39,6 +39,8 @@ public class PrivacyPreferences
@@ -43,6 +43,8 @@ public class PrivacyPreferences
private ManagedPreferenceDelegateCompat mManagedPreferenceDelegate;
@ -69,18 +69,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
@Override
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
PrivacyPreferencesManager privacyPrefManager = PrivacyPreferencesManager.getInstance();
@@ -69,6 +71,10 @@ public class PrivacyPreferences
if (PREF_CAN_MAKE_PAYMENT.equals(key)) {
PrefServiceBridge.getInstance().setBoolean(
Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
@@ -84,6 +86,10 @@ public class PrivacyPreferences
String key = preference.getKey();
if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
PrefServiceBridge.getInstance().setSearchSuggestEnabled((boolean) newValue);
+ } else if (PREF_ALLOW_CUSTOM_TAB_INTENTS.equals(key)) {
+ SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();
+ sharedPreferencesEditor.putBoolean(PREF_ALLOW_CUSTOM_TAB_INTENTS, (boolean)newValue);
+ sharedPreferencesEditor.apply();
} else if (PREF_NETWORK_PREDICTIONS.equals(key)) {
PrefServiceBridge.getInstance().setNetworkPredictionEnabled((boolean) newValue);
}
@@ -98,6 +104,11 @@ public class PrivacyPreferences
return true;
@@ -119,6 +125,11 @@ public class PrivacyPreferences
prefServiceBridge.getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED));
}
@ -95,7 +95,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
--- a/chrome/android/java/strings/android_chrome_strings.grd
+++ b/chrome/android/java/strings/android_chrome_strings.grd
@@ -3965,6 +3965,13 @@ The site does NOT gain access to the camera. The camera images are only visible
@@ -3944,6 +3944,13 @@ The site does NOT gain access to the camera. The camera images are only visible
<message name="IDS_INCOGNITO_DISCLOSURE_CHECKBOX_TEXT" desc="Text for checkbox inviting to close incognito tabs in incognito disclosure dialog." translateable="false">
Close other incognito tabs
</message>

2
build/patches/Add-exit-menu-item.patch
View file

@ -53,7 +53,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLife
diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
--- a/chrome/android/java/strings/android_chrome_strings.grd
+++ b/chrome/android/java/strings/android_chrome_strings.grd
@@ -2959,6 +2959,9 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
@@ -2938,6 +2938,9 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
<message name="IDS_MENU_PREFERENCES" desc="Menu item for opening browser preferences. [CHAR-LIMIT=27]">
Settings
</message>

2
build/patches/Add-global-menu-entry-to-toggle-AdBlocker.patch
View file

@ -170,7 +170,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
--- a/chrome/android/java/strings/android_chrome_strings.grd
+++ b/chrome/android/java/strings/android_chrome_strings.grd
@@ -2964,6 +2964,17 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
@@ -2943,6 +2943,17 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
<message name="IDS_MENU_REQUEST_DESKTOP_SITE_OFF" desc="Accessibility description for when Request Desktop Site is disabled.">
Turn on Request desktop site
</message>

2
build/patches/Add-menu-option-to-toggle-global-Javascript-preference.patch
View file

@ -177,7 +177,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
--- a/chrome/android/java/strings/android_chrome_strings.grd
+++ b/chrome/android/java/strings/android_chrome_strings.grd
@@ -2944,6 +2944,17 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
@@ -2923,6 +2923,17 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
<message name="IDS_MENU_FIND_IN_PAGE" desc="Menu item allowing users to find text within the current page. [CHAR-LIMIT=27]">
Find in page
</message>

46
build/patches/Add-option-to-not-persist-tabs-across-sessions.patch
View file

@ -26,7 +26,7 @@ diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res
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
@@ -28,6 +28,11 @@
@@ -19,6 +19,11 @@
android:fragment="org.chromium.chrome.browser.preferences.privacy.DoNotTrackPreference"
android:key="do_not_track"
android:title="@string/do_not_track_title" />
@ -36,8 +36,8 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
+ android:summary="@string/close_tabs_on_exit_summary"
+ android:defaultValue="false" />
<android.support.v7.preference.Preference
android:key="clear_browsing_data"
android:title="@string/clear_browsing_data_title"
android:key="contextual_search"
android:title="@string/contextual_search_title"
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
@ -64,26 +64,26 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
import android.os.Bundle;
import android.support.graphics.drawable.VectorDrawableCompat;
import android.support.v7.preference.CheckBoxPreference;
@@ -13,6 +14,7 @@ import android.view.Menu;
@@ -14,6 +15,7 @@ import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
+import org.chromium.base.ContextUtils;
import org.chromium.base.BuildInfo;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.help.HelpAndFeedback;
@@ -32,6 +34,7 @@ import org.chromium.ui.text.SpanApplier;
*/
public class PrivacyPreferences
extends PreferenceFragmentCompat implements Preference.OnPreferenceChangeListener {
+ private static final String PREF_CLOSE_TABS_ON_EXIT = "close_tabs_on_exit";
import org.chromium.chrome.browser.ChromeFeatureList;
@@ -38,6 +40,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";
private static final String PREF_USAGE_STATS = "usage_stats_reporting";
@@ -77,6 +80,10 @@ public class PrivacyPreferences
private static final String PREF_CONTEXTUAL_SEARCH = "contextual_search";
+ private static final String PREF_CLOSE_TABS_ON_EXIT = "close_tabs_on_exit";
private static final String PREF_DO_NOT_TRACK = "do_not_track";
private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";
@@ -90,6 +93,10 @@ public class PrivacyPreferences
SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();
sharedPreferencesEditor.putBoolean(PREF_ALLOW_CUSTOM_TAB_INTENTS, (boolean)newValue);
sharedPreferencesEditor.apply();
} else if (PREF_NETWORK_PREDICTIONS.equals(key)) {
PrefServiceBridge.getInstance().setNetworkPredictionEnabled((boolean) newValue);
+ } else if (PREF_CLOSE_TABS_ON_EXIT.equals(key)) {
+ SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();
+ sharedPreferencesEditor.putBoolean(PREF_CLOSE_TABS_ON_EXIT, (boolean)newValue);
@ -91,22 +91,22 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
}
return true;
@@ -114,6 +121,11 @@ public class PrivacyPreferences
doNotTrackPref.setSummary(prefServiceBridge.isDoNotTrackEnabled() ? textOn : textOff);
@@ -140,6 +147,11 @@ public class PrivacyPreferences
boolean isContextualSearchEnabled = !prefServiceBridge.isContextualSearchDisabled();
contextualPref.setSummary(isContextualSearchEnabled ? textOn : textOff);
}
+
+ ChromeBaseCheckBoxPreferenceCompat closeTabsOnExitPref =
+ (ChromeBaseCheckBoxPreferenceCompat) findPreference(PREF_CLOSE_TABS_ON_EXIT);
+ closeTabsOnExitPref.setOnPreferenceChangeListener(this);
+ closeTabsOnExitPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
+
Preference usageStatsPref = findPreference(PREF_USAGE_STATS);
if (usageStatsPref != null) {
if (BuildInfo.isAtLeastQ() && prefServiceBridge.getBoolean(Pref.USAGE_STATS_ENABLED)) {
}
private ManagedPreferenceDelegateCompat createManagedPreferenceDelegate() {
diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
--- a/chrome/android/java/strings/android_chrome_strings.grd
+++ b/chrome/android/java/strings/android_chrome_strings.grd
@@ -3768,6 +3768,12 @@ The site does NOT gain access to the camera. The camera images are only visible
@@ -3747,6 +3747,12 @@ The site does NOT gain access to the camera. The camera images are only visible
<message name="IDS_CONTEXTMENU_IMAGE_TITLE" desc="The title of a context menu tab when the item pressed contains more than one type. This indicates that all the actions are related to the image.">
IMAGE
</message>

2
build/patches/Add-option-to-use-home-page-as-NTP.patch
View file

@ -153,7 +153,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabCre
diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
--- a/chrome/android/java/strings/android_chrome_strings.grd
+++ b/chrome/android/java/strings/android_chrome_strings.grd
@@ -666,6 +666,9 @@ CHAR-LIMIT guidelines:
@@ -648,6 +648,9 @@ CHAR-LIMIT guidelines:
<message name="IDS_OPTIONS_HOMEPAGE_EDIT_LABEL" desc="The label for the edit text field that allows the user to change the URL that is opened when they tap on the home page button in the omnibox.">
Open this page
</message>

2
build/patches/Add-site-settings-option-for-session-only-cookies.patch
View file

@ -165,7 +165,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
--- a/chrome/android/java/strings/android_chrome_strings.grd
+++ b/chrome/android/java/strings/android_chrome_strings.grd
@@ -904,6 +904,12 @@ Your Google account may have other forms of browsing history like searches and a
@@ -880,6 +880,12 @@ Your Google account may have other forms of browsing history like searches and a
<message name="IDS_BLOCK_THIRD_PARTY_COOKIES_SUMMARY" desc="Summary text for Block Third Party Cookies preference">
Prevent third-party websites from saving and reading cookie data
</message>

15
build/patches/Bromite-AdBlockUpdaterService.patch
View file

@ -24,10 +24,10 @@ Download filters by checking Last-Modified header first
.../content/browser/ruleset_version.cc | 1 +
.../content/browser/ruleset_version.h | 5 +
.../content/browser/verified_ruleset_dealer.cc | 2 +
.../core/browser/subresource_filter_features.cc | 115 +---------
.../core/browser/subresource_filter_features.cc | 113 +---------
.../core/common/common_features.cc | 2 +-
.../frame_host/navigation_throttle_runner.cc | 10 -
20 files changed, 818 insertions(+), 147 deletions(-)
20 files changed, 817 insertions(+), 146 deletions(-)
create mode 100644 components/component_updater/adblock_updater_service.cc
create mode 100644 components/component_updater/adblock_updater_service.h
create mode 100644 components/component_updater/download_filters_task.cc
@ -1231,7 +1231,7 @@ diff --git a/components/subresource_filter/core/browser/subresource_filter_featu
// If ad tagging is enabled, turn on the dryrun automatically.
bool ad_tagging_enabled = base::FeatureList::IsEnabled(kAdTagging);
const struct {
@@ -123,25 +61,18 @@ std::vector<Configuration> FillEnabledPresetConfigurations(
@@ -123,23 +61,16 @@ std::vector<Configuration> FillEnabledPresetConfigurations(
bool enabled_by_default;
Configuration (*factory_method)();
} kAvailablePresetConfigurations[] = {
@ -1240,11 +1240,8 @@ diff --git a/components/subresource_filter/core/browser/subresource_filter_featu
&Configuration::MakePresetForLiveRunOnPhishingSites},
{kPresetPerformanceTestingDryRunOnAllSites, ad_tagging_enabled,
&Configuration::MakePresetForPerformanceTestingDryRunOnAllSites},
- {kPresetLiveRunForBetterAds, true,
+ {kPresetLiveRunForBetterAds, false,
&Configuration::MakePresetForLiveRunForBetterAds},
{kPresetLiveRunOnAllSites, true,
&Configuration::MakePresetForLiveRunOnAllSites}};
{kPresetLiveRunForBetterAds, true,
&Configuration::MakePresetForLiveRunForBetterAds}};
- CommaSeparatedStrings enabled_presets(
- TakeVariationParamOrReturnEmpty(params, kEnablePresetsParameterName));
@ -1260,7 +1257,7 @@ diff --git a/components/subresource_filter/core/browser/subresource_filter_featu
enabled_configurations.push_back(available_preset.factory_method());
}
}
@@ -149,46 +80,10 @@ std::vector<Configuration> FillEnabledPresetConfigurations(
@@ -147,46 +78,10 @@ std::vector<Configuration> FillEnabledPresetConfigurations(
return enabled_configurations;
}

2
build/patches/Disable-data-saver.patch
View file

@ -44,7 +44,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/dat
diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
--- a/chrome/android/java/strings/android_chrome_strings.grd
+++ b/chrome/android/java/strings/android_chrome_strings.grd
@@ -1285,9 +1285,6 @@ Your Google account may have other forms of browsing history like searches and a
@@ -1303,9 +1303,6 @@ Your Google account may have other forms of browsing history like searches and a
<message name="IDS_DATA_REDUCTION_DESCRIPTION_LITE_MODE" desc="Text describing how the Lite mode feature works. Seen only before the user has enabled the feature.">
When Lite mode is on, Chrome uses Google servers to make pages load faster. Lite mode rewrites very slow pages to load only essential content. Lite mode does not apply to Incognito tabs.
</message>

440
build/patches/Disable-safe-browsing.patch
View file

@ -4,47 +4,51 @@ Subject: Disable safe browsing
Originally based on ungoogled-chromium patch
---
chrome/android/chrome_java_sources.gni | 1 -
.../chrome/browser/webshare/ShareServiceImpl.java | 6 --
chrome/browser/BUILD.gn | 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 | 40 -------------
chrome/browser/chrome_content_browser_client.cc | 60 ++-----------------
.../file_type_policies_component_installer.cc | 16 +----
.../download/chrome_download_manager_delegate.cc | 31 ++++------
.../download/chrome_download_manager_delegate.h | 6 ++
chrome/browser/download/download_item_model.cc | 13 +++-
chrome/browser/download/download_item_model.h | 4 ++
chrome/browser/download/download_prefs.cc | 17 ++----
.../browser/download/download_target_determiner.cc | 46 +++++++-------
.../browser/download/download_target_determiner.h | 6 ++
chrome/browser/download/download_target_info.cc | 4 ++
chrome/browser/download/download_target_info.h | 4 ++
chrome/browser/download/download_ui_model.cc | 4 ++
chrome/browser/download/download_ui_model.h | 4 ++
.../extensions/api/downloads/downloads_api.cc | 39 +-----------
.../extensions/api/downloads/downloads_api.h | 10 ----
.../api/webstore_private/webstore_private_api.cc | 44 +-------------
.../browser/extensions/blacklist_state_fetcher.cc | 34 ++---------
.../browser/extensions/blacklist_state_fetcher.h | 3 -
.../metrics/chrome_metrics_service_client.cc | 3 -
.../trial_comparison_cert_verifier_controller.cc | 3 -
.../chrome_browser_main_extra_parts_profiles.cc | 1 -
chrome/browser/profiles/profile_impl.cc | 11 ----
chrome/browser/safe_browsing/BUILD.gn | 3 +-
chrome/browser/ssl/captive_portal_blocking_page.cc | 7 +--
chrome/browser/ssl/cert_report_helper.cc | 2 -
chrome/browser/ssl/security_state_tab_helper.cc | 70 ----------------------
.../chrome_subresource_filter_client.cc | 12 ----
chrome/browser/ui/BUILD.gn | 1 -
chrome/browser/ui/tab_helpers.cc | 11 +---
.../ui/webui/interstitials/interstitial_ui.cc | 11 ++--
chrome/common/safe_browsing/BUILD.gn | 15 -----
chrome/renderer/chrome_content_renderer_client.cc | 1 -
components/safe_browsing/features.cc | 2 +-
40 files changed, 105 insertions(+), 500 deletions(-)
chrome/android/chrome_java_sources.gni | 1 -
.../android/java/res/xml/privacy_preferences.xml | 26 -----
.../java/res/xml/sync_and_services_preferences.xml | 20 ----
.../preferences/privacy/PrivacyPreferences.java | 117 ---------------------
.../chrome/browser/webshare/ShareServiceImpl.java | 6 --
.../java/strings/android_chrome_strings.grd | 45 --------
chrome/browser/BUILD.gn | 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 | 40 -------
chrome/browser/chrome_content_browser_client.cc | 60 +----------
.../file_type_policies_component_installer.cc | 16 +--
.../download/chrome_download_manager_delegate.cc | 31 +++---
.../download/chrome_download_manager_delegate.h | 6 ++
chrome/browser/download/download_item_model.cc | 13 ++-
chrome/browser/download/download_item_model.h | 4 +
chrome/browser/download/download_prefs.cc | 17 +--
.../browser/download/download_target_determiner.cc | 46 ++++----
.../browser/download/download_target_determiner.h | 6 ++
chrome/browser/download/download_target_info.cc | 4 +
chrome/browser/download/download_target_info.h | 4 +
chrome/browser/download/download_ui_model.cc | 4 +
chrome/browser/download/download_ui_model.h | 4 +
.../extensions/api/downloads/downloads_api.cc | 39 +------
.../extensions/api/downloads/downloads_api.h | 10 --
.../api/webstore_private/webstore_private_api.cc | 44 +-------
.../browser/extensions/blacklist_state_fetcher.cc | 34 +-----
.../browser/extensions/blacklist_state_fetcher.h | 3 -
.../metrics/chrome_metrics_service_client.cc | 3 -
.../trial_comparison_cert_verifier_controller.cc | 3 -
.../chrome_browser_main_extra_parts_profiles.cc | 1 -
chrome/browser/profiles/profile_impl.cc | 11 --
chrome/browser/safe_browsing/BUILD.gn | 3 +-
chrome/browser/ssl/captive_portal_blocking_page.cc | 7 +-
chrome/browser/ssl/cert_report_helper.cc | 2 -
chrome/browser/ssl/security_state_tab_helper.cc | 70 ------------
.../chrome_subresource_filter_client.cc | 12 ---
chrome/browser/ui/BUILD.gn | 1 -
chrome/browser/ui/tab_helpers.cc | 11 +-
.../ui/webui/interstitials/interstitial_ui.cc | 11 +-
chrome/common/safe_browsing/BUILD.gn | 15 ---
chrome/renderer/chrome_content_renderer_client.cc | 1 -
components/safe_browsing/features.cc | 2 +-
44 files changed, 105 insertions(+), 708 deletions(-)
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
--- a/chrome/android/chrome_java_sources.gni
@ -57,6 +61,277 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
"java/src/org/chromium/chrome/browser/search_engines/SearchEngineChoiceNotification.java",
"java/src/org/chromium/chrome/browser/search_engines/TemplateUrlServiceFactory.java",
"java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.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
@@ -7,40 +7,14 @@
xmlns:app="http://schemas.android.com/apk/res-auto">
<org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreferenceCompat
- android:key="navigation_error"
- android:title="@string/navigation_error_title"
- android:summary="@string/navigation_error_summary"
- android:defaultValue="true" />
- <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreferenceCompat
android:key="search_suggestions"
android:title="@string/search_suggestions_title"
android:summary="@string/search_suggestions_summary"
android:defaultValue="true" />
<org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreferenceCompat
- android:key="safe_browsing_scout_reporting"
- android:title="@string/safe_browsing_scout_reporting_title"
- android:summary="@string/safe_browsing_scout_reporting_summary" />
- <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreferenceCompat
- android:key="safe_browsing"
- android:title="@string/safe_browsing_title"
- android:summary="@string/safe_browsing_summary" />
- <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreferenceCompat
- android:key="network_predictions"
- android:title="@string/network_predictions_title"
- android:summary="@string/network_predictions_summary"
- android:persistent="false" />
- <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreferenceCompat
android:key="can_make_payment"
android:title="@string/can_make_payment_title"
android:summary="@string/settings_can_make_payment_toggle_label" />
- <org.chromium.chrome.browser.preferences.ChromeBasePreferenceCompat
- android:key="usage_stats_reporting"
- android:title="@string/usage_stats_setting_title"
- android:persistent="false" />
- <android.support.v7.preference.Preference
- android:key="usage_and_crash_reports"
- android:title="@string/usage_and_crash_reports_title_legacy"
- android:fragment="org.chromium.chrome.browser.preferences.privacy.UsageAndCrashReportsPreferenceFragment" />
<android.support.v7.preference.Preference
android:fragment="org.chromium.chrome.browser.preferences.privacy.DoNotTrackPreference"
android:key="do_not_track"
diff --git a/chrome/android/java/res/xml/sync_and_services_preferences.xml b/chrome/android/java/res/xml/sync_and_services_preferences.xml
--- a/chrome/android/java/res/xml/sync_and_services_preferences.xml
+++ b/chrome/android/java/res/xml/sync_and_services_preferences.xml
@@ -52,26 +52,6 @@
android:summary="@string/autocomplete_searches_and_urls_summary"
android:persistent="false"/>
<org.chromium.chrome.browser.preferences.ChromeSwitchPreferenceCompat
- android:key="navigation_error"
- android:title="@string/navigation_error_suggestions_title"
- android:summary="@string/navigation_error_suggestions_summary"
- android:persistent="false"/>
- <org.chromium.chrome.browser.preferences.ChromeSwitchPreferenceCompat
- android:key="safe_browsing"
- android:title="@string/safe_browsing_title"
- android:summary="@string/safe_browsing_summary"
- android:persistent="false"/>
- <org.chromium.chrome.browser.preferences.ChromeSwitchPreferenceCompat
- android:key="safe_browsing_scout_reporting"
- android:title="@string/safe_browsing_scout_reporting_title"
- android:summary="@string/safe_browsing_scout_reporting_summary"
- android:persistent="false"/>
- <org.chromium.chrome.browser.preferences.ChromeSwitchPreferenceCompat
- android:key="usage_and_crash_reports"
- android:title="@string/usage_and_crash_reports_title"
- android:summary="@string/usage_and_crash_reports_summary"
- android:persistent="false"/>
- <org.chromium.chrome.browser.preferences.ChromeSwitchPreferenceCompat
android:key="url_keyed_anonymized_data"
android:title="@string/url_keyed_anonymized_data_title"
android:summary="@string/url_keyed_anonymized_data_summary"
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
@@ -35,25 +35,17 @@ import org.chromium.ui.text.SpanApplier;
*/
public class PrivacyPreferences
extends PreferenceFragmentCompat implements Preference.OnPreferenceChangeListener {
- private static final String PREF_NAVIGATION_ERROR = "navigation_error";
private static final String PREF_SEARCH_SUGGESTIONS = "search_suggestions";
- private static final String PREF_SAFE_BROWSING_SCOUT_REPORTING =
- "safe_browsing_scout_reporting";
- private static final String PREF_SAFE_BROWSING = "safe_browsing";
private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";
private static final String PREF_CONTEXTUAL_SEARCH = "contextual_search";
- private static final String PREF_NETWORK_PREDICTIONS = "network_predictions";
private static final String PREF_DO_NOT_TRACK = "do_not_track";
- private static final String PREF_USAGE_AND_CRASH_REPORTING = "usage_and_crash_reports";
private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";
- private static final String PREF_USAGE_STATS = "usage_stats_reporting";
private ManagedPreferenceDelegateCompat mManagedPreferenceDelegate;
@Override
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
PrivacyPreferencesManager privacyPrefManager = PrivacyPreferencesManager.getInstance();
- privacyPrefManager.migrateNetworkPredictionPreferences();
PreferenceUtils.addPreferencesFromResource(this, R.xml.privacy_preferences);
getActivity().setTitle(R.string.prefs_privacy);
setHasOptionsMenu(true);
@@ -66,42 +58,15 @@ public class PrivacyPreferences
(ChromeBaseCheckBoxPreferenceCompat) findPreference(PREF_CAN_MAKE_PAYMENT);
canMakePaymentPref.setOnPreferenceChangeListener(this);
- ChromeBaseCheckBoxPreferenceCompat networkPredictionPref =
- (ChromeBaseCheckBoxPreferenceCompat) findPreference(PREF_NETWORK_PREDICTIONS);
- networkPredictionPref.setChecked(prefServiceBridge.getNetworkPredictionEnabled());
- networkPredictionPref.setOnPreferenceChangeListener(this);
- networkPredictionPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
-
if (ChromeFeatureList.isEnabled(ChromeFeatureList.UNIFIED_CONSENT)) {
// Remove preferences that were migrated to SyncAndServicesPreferences.
- preferenceScreen.removePreference(findPreference(PREF_NAVIGATION_ERROR));
preferenceScreen.removePreference(findPreference(PREF_SEARCH_SUGGESTIONS));
- preferenceScreen.removePreference(findPreference(PREF_SAFE_BROWSING_SCOUT_REPORTING));
- preferenceScreen.removePreference(findPreference(PREF_SAFE_BROWSING));
preferenceScreen.removePreference(findPreference(PREF_CONTEXTUAL_SEARCH));
- preferenceScreen.removePreference(findPreference(PREF_USAGE_AND_CRASH_REPORTING));
-
- // TODO(https://crbug.com/846376): Update strings in XML after UNIFIED_CONSENT launch.
- networkPredictionPref.setTitle(R.string.preload_pages_title);
- networkPredictionPref.setSummary(R.string.preload_pages_summary);
-
- // Put networkPredictionPref after canMakePaymentPref by overriding order value.
- // However, calling setOrder doesn't change existing order if Preference has already
- // been added to PreferenceGroup. Remove and re-add it to work around this.
- // TODO(https://crbug.com/846376): Reorder prefs in XML after UNIFIED_CONSENT launch.
- preferenceScreen.removePreference(networkPredictionPref);
- networkPredictionPref.setOrder(canMakePaymentPref.getOrder());
- preferenceScreen.addPreference(networkPredictionPref);
updateSummaries();
return;
}
- ChromeBaseCheckBoxPreferenceCompat navigationErrorPref =
- (ChromeBaseCheckBoxPreferenceCompat) findPreference(PREF_NAVIGATION_ERROR);
- navigationErrorPref.setOnPreferenceChangeListener(this);
- navigationErrorPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
-
ChromeBaseCheckBoxPreferenceCompat searchSuggestionsPref =
(ChromeBaseCheckBoxPreferenceCompat) findPreference(PREF_SEARCH_SUGGESTIONS);
searchSuggestionsPref.setOnPreferenceChangeListener(this);
@@ -111,18 +76,6 @@ public class PrivacyPreferences
preferenceScreen.removePreference(findPreference(PREF_CONTEXTUAL_SEARCH));
}
- // Listen to changes to the Extended Reporting pref.
- ChromeBaseCheckBoxPreferenceCompat scoutReportingPref =
- (ChromeBaseCheckBoxPreferenceCompat) findPreference(
- PREF_SAFE_BROWSING_SCOUT_REPORTING);
- scoutReportingPref.setOnPreferenceChangeListener(this);
- scoutReportingPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
-
- ChromeBaseCheckBoxPreferenceCompat safeBrowsingPref =
- (ChromeBaseCheckBoxPreferenceCompat) findPreference(PREF_SAFE_BROWSING);
- safeBrowsingPref.setOnPreferenceChangeListener(this);
- safeBrowsingPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
-
updateSummaries();
}
@@ -131,18 +84,6 @@ public class PrivacyPreferences
String key = preference.getKey();
if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
PrefServiceBridge.getInstance().setSearchSuggestEnabled((boolean) newValue);
- } else if (PREF_SAFE_BROWSING.equals(key)) {
- PrefServiceBridge.getInstance().setSafeBrowsingEnabled((boolean) newValue);
- } else if (PREF_SAFE_BROWSING_SCOUT_REPORTING.equals(key)) {
- PrefServiceBridge.getInstance().setSafeBrowsingExtendedReportingEnabled(
- (boolean) newValue);
- } else if (PREF_NETWORK_PREDICTIONS.equals(key)) {
- PrefServiceBridge.getInstance().setNetworkPredictionEnabled((boolean) newValue);
- } else if (PREF_NAVIGATION_ERROR.equals(key)) {
- PrefServiceBridge.getInstance().setResolveNavigationErrorEnabled((boolean) newValue);
- } else if (PREF_CAN_MAKE_PAYMENT.equals(key)) {
- PrefServiceBridge.getInstance().setBoolean(
- Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
}
return true;
@@ -165,32 +106,12 @@ public class PrivacyPreferences
CharSequence textOn = getActivity().getResources().getText(R.string.text_on);
CharSequence textOff = getActivity().getResources().getText(R.string.text_off);
- CheckBoxPreference navigationErrorPref = (CheckBoxPreference) findPreference(
- PREF_NAVIGATION_ERROR);
- if (navigationErrorPref != null) {
- navigationErrorPref.setChecked(
- prefServiceBridge.isResolveNavigationErrorEnabled());
- }
-
CheckBoxPreference searchSuggestionsPref = (CheckBoxPreference) findPreference(
PREF_SEARCH_SUGGESTIONS);
if (searchSuggestionsPref != null) {
searchSuggestionsPref.setChecked(prefServiceBridge.isSearchSuggestEnabled());
}
- CheckBoxPreference extendedReportingPref =
- (CheckBoxPreference) findPreference(PREF_SAFE_BROWSING_SCOUT_REPORTING);
- if (extendedReportingPref != null) {
- extendedReportingPref.setChecked(
- prefServiceBridge.isSafeBrowsingExtendedReportingEnabled());
- }
-
- CheckBoxPreference safeBrowsingPref =
- (CheckBoxPreference) findPreference(PREF_SAFE_BROWSING);
- if (safeBrowsingPref != null) {
- safeBrowsingPref.setChecked(prefServiceBridge.isSafeBrowsingEnabled());
- }
-
CheckBoxPreference canMakePaymentPref =
(CheckBoxPreference) findPreference(PREF_CAN_MAKE_PAYMENT);
if (canMakePaymentPref != null) {
@@ -208,53 +129,15 @@ public class PrivacyPreferences
boolean isContextualSearchEnabled = !prefServiceBridge.isContextualSearchDisabled();
contextualPref.setSummary(isContextualSearchEnabled ? textOn : textOff);
}
-
- Preference usageAndCrashPref = findPreference(PREF_USAGE_AND_CRASH_REPORTING);
- if (usageAndCrashPref != null) {
- usageAndCrashPref.setSummary(
- privacyPrefManager.isUsageAndCrashReportingPermittedByUser() ? textOn
- : textOff);
- }
-
- Preference usageStatsPref = findPreference(PREF_USAGE_STATS);
- if (usageStatsPref != null) {
- if (BuildInfo.isAtLeastQ() && prefServiceBridge.getBoolean(Pref.USAGE_STATS_ENABLED)) {
- usageStatsPref.setOnPreferenceClickListener(preference -> {
- UsageStatsConsentDialog
- .create(getActivity(), true,
- (didConfirm) -> {
- if (didConfirm) {
- updateSummaries();
- }
- })
- .show();
- return true;
- });
- } else {
- getPreferenceScreen().removePreference(usageStatsPref);
- }
- }
}
private ManagedPreferenceDelegateCompat createManagedPreferenceDelegate() {
return preference -> {
String key = preference.getKey();
PrefServiceBridge prefs = PrefServiceBridge.getInstance();
- if (PREF_NAVIGATION_ERROR.equals(key)) {
- return prefs.isResolveNavigationErrorManaged();
- }
if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
return prefs.isSearchSuggestManaged();
}
- if (PREF_SAFE_BROWSING_SCOUT_REPORTING.equals(key)) {
- return prefs.isSafeBrowsingExtendedReportingManaged();
- }
- if (PREF_SAFE_BROWSING.equals(key)) {
- return prefs.isSafeBrowsingManaged();
- }
- if (PREF_NETWORK_PREDICTIONS.equals(key)) {
- return prefs.isNetworkPredictionManaged();
- }
return false;
};
}
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
@ -80,10 +355,91 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webshare/ShareS
if (isDangerousFilename(file.name) || isDangerousMimeType(file.blob.contentType)) {
Log.i(TAG,
"Cannot share potentially dangerous \"" + file.blob.contentType
diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
--- a/chrome/android/java/strings/android_chrome_strings.grd
+++ b/chrome/android/java/strings/android_chrome_strings.grd
@@ -391,30 +391,12 @@ CHAR-LIMIT guidelines:
<message name="IDS_AUTOCOMPLETE_SEARCHES_AND_URLS_SUMMARY" desc="Summary for a checkbox in Settings that controls URL and search autocompletion and informs the user about the data shared by this feature.">
Sends some cookies and searches from the address bar and search box to your default search engine
</message>
- <message name="IDS_PRELOAD_PAGES_TITLE" desc="Title for a checkbox in Settings that controls pages preloading and informs the user about the data shared by this feature.">
- Preload pages for faster browsing and searching
- </message>
- <message name="IDS_PRELOAD_PAGES_SUMMARY" desc="Summary for a checkbox in Settings that controls pages preloading and informs the user about the data shared by this feature.">
- Uses cookies to remember your preferences, even if you don't visit those pages
- </message>
- <message name="IDS_NAVIGATION_ERROR_SUGGESTIONS_TITLE" desc="Title for a checkbox in Settings that controls pages suggestions on navigation errors and informs the user about the data shared by this feature.">
- Show suggestions for similar pages when a page can't be found
- </message>
- <message name="IDS_NAVIGATION_ERROR_SUGGESTIONS_SUMMARY" desc="Summary for a checkbox in Settings that controls pages suggestions on navigation errors and informs the user about the data shared by this feature.">
- Sends the URL of a page you're trying to reach to Google
- </message>
<message name="IDS_URL_KEYED_ANONYMIZED_DATA_TITLE" desc="Title for a checkbox in Settings that controls non-personalized URL collection and informs the user about the data shared by this feature.">
Make searches and browsing better
</message>
<message name="IDS_URL_KEYED_ANONYMIZED_DATA_SUMMARY" desc="Summary for a checkbox in Settings that controls non-personalized URL collection and informs the user about the data shared by this feature.">
Sends URLs of pages you visit to Google
</message>
- <message name="IDS_USAGE_AND_CRASH_REPORTS_TITLE" desc="Title for a preference that enables sending usage statistics and crash reports.">
- Help improve Chrome's features and performance
- </message>
- <message name="IDS_USAGE_AND_CRASH_REPORTS_SUMMARY" desc="Description for 'Help improve Chrome's features and performance' preference.">
- Automatically sends usage statistics and crash reports to Google
- </message>
<message name="IDS_CANCEL_SYNC_DIALOG_TITLE" desc="The title of a dialog that is shown when users tries closing 'Sync and Google services' preferences without confirming the changes.">
Cancel sync?
</message>
@@ -704,36 +686,12 @@ CHAR-LIMIT guidelines:
<message name="IDS_PREFS_PRIVACY" desc="Title for the Privacy preferences. [CHAR-LIMIT=32]">
Privacy
</message>
- <message name="IDS_NAVIGATION_ERROR_TITLE" desc="Title for checkbox to enable or disable navigation error suggestions.">
- Navigation error suggestions
- </message>
- <message name="IDS_NAVIGATION_ERROR_SUMMARY" desc="Summary for navigation error suggestions.">
- Show suggestions when a web address does not resolve or a connection cannot be made
- </message>
<message name="IDS_SEARCH_SUGGESTIONS_TITLE" desc="Title for search and url suggestions.">
Search and URL suggestions
</message>
<message name="IDS_SEARCH_SUGGESTIONS_SUMMARY" desc="Summary for search and url suggestions.">
Use a prediction service to show related queries and popular websites as you type in the address bar
</message>
- <message name="IDS_SAFE_BROWSING_SCOUT_REPORTING_TITLE" desc="Title for checkbox that controls reporting data to detect bad apps/sites. Please ensure ‘Safe Browsing’ in this message matches the ‘Safe Browsing’ settings title.">
- Help improve Chrome security
- </message>
- <message name="IDS_SAFE_BROWSING_SCOUT_REPORTING_SUMMARY" desc="Body text for Chrome setting under 'Help Improve Safe Browsing'. This feature sends small amounts of data to Google about potentially-dangerous pages to help Safe Browsing improve Chrome's protection against malware and phishing.">
- To detect dangerous apps and sites, Chrome sends URLs of some pages you visit, limited system information, and some page content to Google
- </message>
- <message name="IDS_SAFE_BROWSING_TITLE" desc="Title for safe browsing.">
- Safe Browsing (protects you and your device from dangerous sites)
- </message>
- <message name="IDS_SAFE_BROWSING_SUMMARY" desc="Summary for safe browsing.">
- Sends URLs of some pages you visit to Google, when your security is at risk
- </message>
- <message name="IDS_NETWORK_PREDICTIONS_TITLE" desc="Title of a setting in Chrome settings. Followed by a body that describes the setting. If setting is turned on, Chrome will download certain pages to the user’s phone automatically for offline reading. 'predictions' convey the idea that Chrome is using predictive models to figure out pages likely of interest to the user.">
- Use page predictions
- </message>
- <message name="IDS_NETWORK_PREDICTIONS_SUMMARY" desc="Body text for the “Use page predictions” setting in Chrome settings. Describes what happens if the setting is turned on. 'Preload' conveys the idea that Chrome is getting pages for the user without their explicit interaction or consent.">
- Preload pages for faster loading and offline reading
- </message>
<message name="IDS_CONTEXTUAL_SEARCH_TITLE" desc="Name for the Contextual Search feature, which allows users to search for a term in a web page by tapping on it.">
Tap to Search
</message>
@@ -3956,9 +3914,6 @@ The site does NOT gain access to the camera. The camera images are only visible
<message name="IDS_USAGE_STATS_CONSENT_PROMPT" desc="Consent prompt when authorizing Digital Wellbeing to access Chrome usage data">
You can see sites you visit in Chrome and set timers for them.\n\nGoogle gets info about the sites you set timers for and how long you visit them. This info is used to make Digital Wellbeing better.
</message>
- <message name="IDS_USAGE_STATS_SETTING_TITLE" desc="Title for setting removing Digital Wellbeing's access to Chrome usage data">
- Remove your Chrome activity from Digital Wellbeing
- </message>
<message name="IDS_USAGE_STATS_REVOCATION_PROMPT" desc="Prompt for removing Digital Wellbeing's access to Chrome usage data">
Remove your Chrome activity from Digital Wellbeing?
</message>
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2954,8 +2954,6 @@ jumbo_split_static_library("browser") {
@@ -2952,8 +2952,6 @@ jumbo_split_static_library("browser") {
"download/download_commands.h",
"download/download_crx_util.cc",
"download/download_crx_util.h",

58
build/patches/Disable-signin-and-data-saver-preferences.patch
View file

@ -5,11 +5,11 @@ Subject: Disable signin and data saver preferences
Never show the data saver promo snackbar
---
chrome/android/java/res/xml/main_preferences.xml | 20 -----
.../android/java/res/xml/privacy_preferences.xml | 4 -
.../android/java/res/xml/privacy_preferences.xml | 8 --
.../browser/preferences/MainPreferences.java | 86 +---------------------
.../preferences/privacy/PrivacyPreferences.java | 12 ---
.../preferences/privacy/PrivacyPreferences.java | 17 -----
.../java/strings/android_chrome_strings.grd | 6 --
5 files changed, 1 insertion(+), 127 deletions(-)
5 files changed, 1 insertion(+), 136 deletions(-)
diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
--- a/chrome/android/java/res/xml/main_preferences.xml
@ -51,10 +51,14 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j
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
@@ -28,8 +28,4 @@
@@ -54,12 +54,4 @@
android:title="@string/clear_browsing_data_title"
android:summary="@string/clear_browsing_data_summary"
android:fragment="org.chromium.chrome.browser.preferences.privacy.ClearBrowsingDataTabsFragment" />
- <android.support.v7.preference.Preference
- android:key="sync_and_services_link_divider"
- android:layout="@layout/divider_preference"
- android:selectable="false"/>
- <org.chromium.chrome.browser.preferences.TextMessagePreferenceCompat
- android:key="sync_and_services_link"
- android:summary="@string/privacy_sync_and_services_link"
@ -265,7 +269,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
@@ -22,7 +22,6 @@ import org.chromium.chrome.browser.preferences.Pref;
@@ -25,7 +25,6 @@ import org.chromium.chrome.browser.preferences.Pref;
import org.chromium.chrome.browser.preferences.PrefServiceBridge;
import org.chromium.chrome.browser.preferences.PreferenceUtils;
import org.chromium.chrome.browser.preferences.PreferencesLauncher;
@ -273,31 +277,39 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.usage_stats.UsageStatsConsentDialog;
import org.chromium.ui.text.NoUnderlineClickableSpan;
@@ -37,7 +36,6 @@ public class PrivacyPreferences
private static final String PREF_NETWORK_PREDICTIONS = "preload_pages";
private static final String PREF_USAGE_STATS = "usage_stats_reporting";
@@ -47,9 +46,6 @@ public class PrivacyPreferences
private static final String PREF_DO_NOT_TRACK = "do_not_track";
private static final String PREF_USAGE_AND_CRASH_REPORTING = "usage_and_crash_reports";
private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";
- 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";
private static final String PREF_USAGE_STATS = "usage_stats_reporting";
private ManagedPreferenceDelegateCompat mManagedPreferenceDelegate;
@@ -97,22 +93,9 @@ public class PrivacyPreferences
networkPredictionPref.setOrder(canMakePaymentPref.getOrder());
preferenceScreen.addPreference(networkPredictionPref);
@@ -62,16 +60,6 @@ public class PrivacyPreferences
networkPredictionPref.setOnPreferenceChangeListener(this);
networkPredictionPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
- Preference syncAndServicesLink = findPreference(PREF_SYNC_AND_SERVICES_LINK);
- NoUnderlineClickableSpan linkSpan = new NoUnderlineClickableSpan(getResources(), view -> {
- PreferencesLauncher.launchSettingsPageCompat(getActivity(),
- SyncAndServicesPreferences.class,
- SyncAndServicesPreferences.createArguments(false));
- });
- syncAndServicesLink.setSummary(
- SpanApplier.applySpans(getString(R.string.privacy_sync_and_services_link),
- new SpanApplier.SpanInfo("<link>", "</link>", linkSpan)));
- Preference syncAndServicesLink = findPreference(PREF_SYNC_AND_SERVICES_LINK);
- NoUnderlineClickableSpan linkSpan =
- new NoUnderlineClickableSpan(getResources(), view -> {
- PreferencesLauncher.launchSettingsPage(getActivity(),
- SyncAndServicesPreferences.class,
- SyncAndServicesPreferences.createArguments(false));
- });
- syncAndServicesLink.setSummary(
- SpanApplier.applySpans(getString(R.string.privacy_sync_and_services_link),
- new SpanApplier.SpanInfo("<link>", "</link>", linkSpan)));
-
updateSummaries();
}
updateSummaries();
return;
}
- preferenceScreen.removePreference(findPreference(PREF_SYNC_AND_SERVICES_LINK_DIVIDER));
- preferenceScreen.removePreference(findPreference(PREF_SYNC_AND_SERVICES_LINK));
ChromeBaseCheckBoxPreferenceCompat navigationErrorPref =
(ChromeBaseCheckBoxPreferenceCompat) findPreference(PREF_NAVIGATION_ERROR);
diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
--- a/chrome/android/java/strings/android_chrome_strings.grd
+++ b/chrome/android/java/strings/android_chrome_strings.grd

23
build/patches/Revert-Remove-UnifiedConsent-from-ChromeFeatureList.patch Normal file
View file

@ -0,0 +1,23 @@
From: csagan5 <32685696+csagan5@users.noreply.github.com>
Date: Thu, 26 Sep 2019 00:00:43 +0200
Subject: Revert "Remove UnifiedConsent from ChromeFeatureList"
This reverts commit c513d4c926a42ba6cc5eccfd5e85ba64c38bf0c1.
---
.../android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
@@ -327,6 +327,7 @@ public abstract class ChromeFeatureList {
"TrustedWebActivityNotificationDelegationAutoEnrolment";
public static final String TWO_PANES_START_SURFACE_ANDROID = "TwoPanesStartSurfaceAndroid";
public static final String VIDEO_PERSISTENCE = "VideoPersistence";
+ public static final String UNIFIED_CONSENT = "UnifiedConsent";
public static final String USAGE_STATS = "UsageStats";
public static final String VR_BROWSING_FEEDBACK = "VrBrowsingFeedback";
public static final String USER_ACTIVATION_V2 = "UserActivationV2";
--
2.11.0

1991
build/patches/Revert-Remove-pre-unified-consent-code-in-sync-and-privacy-directory.patch Normal file
View file

File diff suppressed because it is too large Load diff

68
build/patches/enable-subresource-filter-on-all-sites.patch
View file

@ -1,68 +0,0 @@
From: Zoraver Kang <zkang@wpi.edu>
Date: Thu, 22 Aug 2019 01:24:00 -0400
Subject: enable subresource filter on all sites
---
.../core/browser/subresource_filter_features.cc | 13 ++++++++++++-
.../core/browser/subresource_filter_features.h | 2 ++
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/components/subresource_filter/core/browser/subresource_filter_features.cc b/components/subresource_filter/core/browser/subresource_filter_features.cc
--- a/components/subresource_filter/core/browser/subresource_filter_features.cc
+++ b/components/subresource_filter/core/browser/subresource_filter_features.cc
@@ -128,7 +128,9 @@ std::vector<Configuration> FillEnabledPresetConfigurations(
{kPresetPerformanceTestingDryRunOnAllSites, ad_tagging_enabled,
&Configuration::MakePresetForPerformanceTestingDryRunOnAllSites},
{kPresetLiveRunForBetterAds, true,
- &Configuration::MakePresetForLiveRunForBetterAds}};
+ &Configuration::MakePresetForLiveRunForBetterAds},
+ {kPresetLiveRunOnAllSites, true,
+ &Configuration::MakePresetForLiveRunOnAllSites}};
CommaSeparatedStrings enabled_presets(
TakeVariationParamOrReturnEmpty(params, kEnablePresetsParameterName));
@@ -270,6 +272,7 @@ const char kPresetPerformanceTestingDryRunOnAllSites[] =
"performance_testing_dryrun_on_all_sites";
const char kPresetLiveRunForBetterAds[] =
"liverun_on_better_ads_violating_sites";
+const char kPresetLiveRunOnAllSites[] = "liverun_on_all_sites";
// Configuration --------------------------------------------------------------
@@ -300,6 +303,14 @@ Configuration Configuration::MakePresetForLiveRunForBetterAds() {
return config;
}
+// static
+Configuration Configuration::MakePresetForLiveRunOnAllSites() {
+ Configuration config(mojom::ActivationLevel::kEnabled,
+ ActivationScope::ALL_SITES);
+ config.activation_conditions.priority = 600;
+ return config;
+}
+
Configuration::Configuration() = default;
Configuration::Configuration(mojom::ActivationLevel activation_level,
ActivationScope activation_scope,
diff --git a/components/subresource_filter/core/browser/subresource_filter_features.h b/components/subresource_filter/core/browser/subresource_filter_features.h
--- a/components/subresource_filter/core/browser/subresource_filter_features.h
+++ b/components/subresource_filter/core/browser/subresource_filter_features.h
@@ -122,6 +122,7 @@ struct Configuration {
static Configuration MakePresetForLiveRunOnPhishingSites();
static Configuration MakePresetForPerformanceTestingDryRunOnAllSites();
static Configuration MakePresetForLiveRunForBetterAds();
+ static Configuration MakePresetForLiveRunOnAllSites();
ActivationConditions activation_conditions;
ActivationOptions activation_options;
@@ -219,6 +220,7 @@ extern const char kDisablePresetsParameterName[];
extern const char kPresetLiveRunOnPhishingSites[];
extern const char kPresetPerformanceTestingDryRunOnAllSites[];
extern const char kPresetLiveRunForBetterAds[];
+extern const char kPresetLiveRunOnAllSites[];
} // namespace subresource_filter
--
2.11.0

2
build/patches/ungoogled-chromium-Disable-translate-integration.patch
View file

@ -74,7 +74,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/lan
diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
--- a/chrome/android/java/strings/android_chrome_strings.grd
+++ b/chrome/android/java/strings/android_chrome_strings.grd
@@ -1175,9 +1175,6 @@ Your Google account may have other forms of browsing history like searches and a
@@ -1193,9 +1193,6 @@ Your Google account may have other forms of browsing history like searches and a
<message name="IDS_LANGUAGES_LIST_PREFS_DESCRIPTION" desc="Description on the Languages settings screen. Appears above a list of one or more languages that the user selects, to tell Chrome which languages they prefer to use to read website content.">
Websites will show text in your preferred language, when possible.
</message>

3
build/patches_list.txt
View file

@ -1,4 +1,6 @@
Disable-third-party-cookies-by-default.patch
Revert-Remove-pre-unified-consent-code-in-sync-and-privacy-directory.patch
Revert-Remove-UnifiedConsent-from-ChromeFeatureList.patch
Restore-classic-new-tab-page.patch
Always-use-new-tab-page-for-default-home-page.patch
Always-allow-partner-customisation.patch
@ -122,6 +124,5 @@ Disable-media-router-and-remoting-by-default.patch
Do-not-record-UMA-for-network-errors.patch
Disable-unified-consent-on-Android.patch
Disable-search-ready-omnibox-by-default.patch
enable-subresource-filter-on-all-sites.patch
disable-AdsBlockedInfoBar.patch
Bromite-AdBlockUpdaterService.patch