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

Merge pull request #809 from uazo/v87

Browse source 
Update patches for v87
This commit is contained in:
Carl 2020-11-16 20:19:20 +01:00 • committed by GitHub
commit d446f0e453
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 1788 additions and 247 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
build/bromite_patches_list.txt
View file

@ -146,6 +146,7 @@ Disable-the-DIAL-repeating-discovery.patch
Block-all-connection-requests-with-qjz9zk-in-the-domain-name-or-with-a-trk-scheme.patch
Hardening-against-incognito-mode-detection.patch
Remove-weblayer-dependency-on-Play-Services.patch
Timezone-customization.patch
Move-some-account-settings-back-to-privacy-settings.patch
Flag-for-always-desktop-mode.patch
Restore-Simplified-NTP-launch.patch

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

@ -37,7 +37,7 @@ Offer auto-complete for the proxy page URL.
diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
--- a/chrome/android/java/res/values/values.xml
+++ b/chrome/android/java/res/values/values.xml
@@ -38,6 +38,9 @@
@@ -32,6 +32,9 @@
<integer name="reload_button_level_reload">0</integer>
<integer name="reload_button_level_stop">1</integer>
@ -69,7 +69,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
private static final String PREF_ALWAYS_INCOGNITO = "always_incognito";
public static final String PREF_ALLOW_CUSTOM_TAB_INTENTS = "allow_custom_tab_intents";
+ private static final String PREF_PROXY_OPTIONS = "proxy";
+
+
private static final String[] NEW_PRIVACY_PREFERENCE_ORDER = {PREF_CLEAR_BROWSING_DATA,
PREF_CAN_MAKE_PAYMENT, PREF_NETWORK_PREDICTIONS,
PREF_SECURE_DNS, PREF_DO_NOT_TRACK,
@ -77,7 +77,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
PREF_ALLOW_CUSTOM_TAB_INTENTS,
- PREF_CLOSE_TABS_ON_EXIT
+ PREF_CLOSE_TABS_ON_EXIT,
+ PREF_PROXY_OPTIONS
+ PREF_PROXY_OPTIONS
};
private ManagedPreferenceDelegate mManagedPreferenceDelegate;

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

@ -44,7 +44,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
android:summary="@string/preload_pages_summary"
android:persistent="false"
android:order="1"/>
+ <org.chromium.components.browser_ui.settings.ChromeBaseCheckBoxPreference
+ <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
+ android:key="always_incognito"
+ android:title="@string/always_incognito_title"
+ android:summary="@string/always_incognito_summary"

15
build/patches/Add-bookmark-import-export-actions.patch
View file

@ -14,7 +14,7 @@ Completely remove contacts picker permission from the file dialog
.../browser/bookmarks/BookmarkDelegate.java | 10 +
.../browser/bookmarks/BookmarkManager.java | 19 ++
.../browser/bookmarks/BookmarkPage.java | 1 +
chrome/browser/BUILD.gn | 4 +-
chrome/browser/BUILD.gn | 6 +-
.../android/bookmarks/bookmark_bridge.cc | 217 ++++++++++++++++++
.../android/bookmarks/bookmark_bridge.h | 20 +-
chrome/browser/importer/profile_writer.cc | 12 +
@ -28,7 +28,7 @@ Completely remove contacts picker permission from the file dialog
ui/shell_dialogs/select_file_dialog.h | 2 +
.../select_file_dialog_android.cc | 6 +
ui/shell_dialogs/select_file_dialog_android.h | 2 +
22 files changed, 445 insertions(+), 12 deletions(-)
22 files changed, 447 insertions(+), 12 deletions(-)
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
--- a/chrome/android/java/AndroidManifest.xml
@ -333,7 +333,16 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"bluetooth/bluetooth_chooser_context.cc",
"bluetooth/bluetooth_chooser_context.h",
"bluetooth/bluetooth_chooser_context_factory.cc",
@@ -3298,8 +3300,6 @@ static_library("browser") {
@@ -1821,6 +1823,8 @@ static_library("browser") {
"web_data_service_factory.h",
"window_placement/window_placement_permission_context.cc",
"window_placement/window_placement_permission_context.h",
+ "importer/profile_writer.cc",
+ "importer/profile_writer.h",
]
configs += [
@@ -3298,8 +3302,6 @@ static_library("browser") {
"badging/badge_manager_factory.h",
"banners/app_banner_manager_desktop.cc",
"banners/app_banner_manager_desktop.h",

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

@ -3,26 +3,12 @@ Date: Wed, 29 Aug 2018 11:03:44 +0200
Subject: Add custom tab intents privacy option
---
chrome/android/java/res/values/values.xml | 3 +++
chrome/android/java/res/xml/privacy_preferences.xml | 5 +++++
.../chrome/browser/LaunchIntentDispatcher.java | 4 ++++
.../browser/privacy/settings/PrivacySettings.java | 13 ++++++++++++-
.../ui/android/strings/android_chrome_strings.grd | 7 +++++++
5 files changed, 31 insertions(+), 1 deletion(-)
4 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
--- a/chrome/android/java/res/values/values.xml
+++ b/chrome/android/java/res/values/values.xml
@@ -14,6 +14,9 @@
<item name="top_controls_show_threshold" format="float" type="dimen">0.5</item>
<item name="top_controls_hide_threshold" format="float" type="dimen">0.5</item>
+ <string name="allow_custom_tab_intents_title">Allow custom tab intents from applications</string>
+ <string name="allow_custom_tab_intents_summary">When disabled, all custom tab intents will be processed as regular navigation instead</string>
+
<!-- The number of thumbnails that the thumbnail cache can hold. -->
<integer name="default_thumbnail_cache_size">5</integer>
<!-- The number of approximation thumbnails that the approximation cache can hold. -->
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
@ -30,7 +16,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
android:key="do_not_track"
android:title="@string/do_not_track_title"
android:order="3"/>
+ <org.chromium.components.browser_ui.settings.ChromeBaseCheckBoxPreference
+ <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
+ android:key="allow_custom_tab_intents"
+ android:title="@string/allow_custom_tab_intents_title"
+ android:summary="@string/allow_custom_tab_intents_summary"
@ -91,8 +77,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
canMakePaymentPref.setChecked(prefService.getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED));
}
+ ChromeBaseCheckBoxPreference allowCustomTabIntentsPref =
+ (ChromeBaseCheckBoxPreference) findPreference(PREF_ALLOW_CUSTOM_TAB_INTENTS);
+ ChromeSwitchPreference allowCustomTabIntentsPref =
+ (ChromeSwitchPreference) findPreference(PREF_ALLOW_CUSTOM_TAB_INTENTS);
+ allowCustomTabIntentsPref.setOnPreferenceChangeListener(this);
+ allowCustomTabIntentsPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
+

55
build/patches/Add-history-support-in-incognito-mode.patch
View file

@ -3,16 +3,15 @@ Date: Fri, 7 Aug 2020 16:33:47 +0000
Subject: Add history support in incognito mode
---
.../java/res/xml/privacy_preferences.xml | 5 ++++
.../privacy/settings/PrivacySettings.java | 23 +++++++++++++++++--
chrome/browser/history/history_tab_helper.cc | 16 +++++++++++++
.../java/res/xml/privacy_preferences.xml | 5 +++++
.../privacy/settings/PrivacySettings.java | 19 +++++++++++++++++++
chrome/browser/history/history_tab_helper.cc | 16 ++++++++++++++++
chrome/browser/history/history_tab_helper.h | 4 ++++
chrome/browser/prefs/browser_prefs.cc | 3 +++
.../strings/android_chrome_strings.grd | 6 +++++
.../android_chrome_strings_it.xtb | 4 +++-
chrome/common/pref_names.cc | 5 ++++
.../strings/android_chrome_strings.grd | 6 ++++++
chrome/common/pref_names.cc | 5 +++++
chrome/common/pref_names.h | 4 ++++
9 files changed, 67 insertions(+), 3 deletions(-)
8 files changed, 62 insertions(+)
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
@ -21,7 +20,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
android:title="@string/close_tabs_on_exit_title"
android:summary="@string/close_tabs_on_exit_summary"
android:defaultValue="false" />
+ <org.chromium.components.browser_ui.settings.ChromeBaseCheckBoxPreference
+ <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
+ android:key="incognito_history_enabled"
+ android:title="@string/incognito_history_enabled_title"
+ android:summary="@string/incognito_history_enabled_summary"
@ -41,13 +40,12 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
/**
* Fragment to keep track of the all the privacy related preferences.
*/
@@ -50,14 +52,16 @@ public class PrivacySettings
@@ -50,11 +52,13 @@ public class PrivacySettings
private static final String PREF_ALWAYS_INCOGNITO = "always_incognito";
public static final String PREF_ALLOW_CUSTOM_TAB_INTENTS = "allow_custom_tab_intents";
private static final String PREF_PROXY_OPTIONS = "proxy";
-
+ public static final String PREF_INCOGNITO_TAB_HISTORY_ENABLED = "incognito_history_enabled";
+
private static final String[] NEW_PRIVACY_PREFERENCE_ORDER = {PREF_CLEAR_BROWSING_DATA,
PREF_CAN_MAKE_PAYMENT, PREF_NETWORK_PREDICTIONS,
PREF_SECURE_DNS, PREF_DO_NOT_TRACK,
@ -55,17 +53,13 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
+ PREF_INCOGNITO_TAB_HISTORY_ENABLED,
PREF_ALLOW_CUSTOM_TAB_INTENTS,
PREF_CLOSE_TABS_ON_EXIT,
- PREF_PROXY_OPTIONS
+ PREF_PROXY_OPTIONS
};
private ManagedPreferenceDelegate mManagedPreferenceDelegate;
PREF_PROXY_OPTIONS
@@ -97,6 +101,11 @@ public class PrivacySettings
Preference secureDnsPref = findPreference(PREF_SECURE_DNS);
secureDnsPref.setVisible(SecureDnsSettings.isUiEnabled());
+ ChromeBaseCheckBoxPreference historyInIncognitoPref =
+ (ChromeBaseCheckBoxPreference) findPreference(PREF_INCOGNITO_TAB_HISTORY_ENABLED);
+ ChromeSwitchPreference historyInIncognitoPref =
+ (ChromeSwitchPreference) findPreference(PREF_INCOGNITO_TAB_HISTORY_ENABLED);
+ historyInIncognitoPref.setOnPreferenceChangeListener(this);
+ historyInIncognitoPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
+
@ -83,12 +77,12 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
return true;
@@ -160,6 +172,13 @@ public class PrivacySettings
(ChromeBaseCheckBoxPreference) findPreference(PREF_CLOSE_TABS_ON_EXIT);
(ChromeSwitchPreference) findPreference(PREF_CLOSE_TABS_ON_EXIT);
closeTabsOnExitPref.setOnPreferenceChangeListener(this);
closeTabsOnExitPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
+
+ CheckBoxPreference historyInIncognitoPref =
+ (CheckBoxPreference) findPreference(PREF_INCOGNITO_TAB_HISTORY_ENABLED);
+ ChromeSwitchPreference historyInIncognitoPref =
+ (ChromeSwitchPreference) findPreference(PREF_INCOGNITO_TAB_HISTORY_ENABLED);
+ if (historyInIncognitoPref != null) {
+ historyInIncognitoPref.setChecked(
+ prefService.getBoolean(Pref.INCOGNITO_TAB_HISTORY_ENABLED));
@ -115,9 +109,9 @@ diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/histo
Profile::FromBrowserContext(web_contents()->GetBrowserContext());
+
+#if defined(OS_ANDROID)
+ if(profile->GetOriginalProfile()->GetPrefs()->GetBoolean(prefs::kIncognitoTabHistoryEnabled)) {
+ return HistoryServiceFactory::GetForProfile(profile, ServiceAccessType::IMPLICIT_ACCESS);
+ }
+ if(profile->GetOriginalProfile()->GetPrefs()->GetBoolean(prefs::kIncognitoTabHistoryEnabled)) {
+ return HistoryServiceFactory::GetForProfile(profile, ServiceAccessType::IMPLICIT_ACCESS);
+ }
+#endif
+
if (profile->IsOffTheRecord())
@ -193,18 +187,6 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
<message name="IDS_CLEAR_BROWSING_HISTORY_SUMMARY_SIGNED_IN" desc="A text explaining other forms of activity for signed in users.">
Clears history and autocompletions in the address bar. Your Google Account may have other forms of browsing history at <ph name="BEGIN_LINK">&lt;link&gt;</ph>myactivity.google.com<ph name="END_LINK">&lt;/link&gt;</ph>.
</message>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_it.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_it.xtb
--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_it.xtb
+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_it.xtb
@@ -1142,4 +1142,6 @@ I dati della sessione in incognito vengono cancellati da Chrome soltanto quando
<translation id="983192555821071799">Chiudi tutte le schede</translation>
<translation id="987264212798334818">Generali</translation>
<translation id="996149300115483134">Menu scheda feed chiuso</translation>
-</translationbundle>
\ No newline at end of file
+<translation id="7889537574758531583">Abilita la cronologia nelle sessioni in incognito</translation>
+<translation id="5713583121562162330">Abilita la registrazione della navigazione nella cronologia anche per le sessioni in incognito</translation>
+</translationbundle>
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@ -234,4 +216,3 @@ diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
#endif // CHROME_COMMON_PREF_NAMES_H_
--
2.17.1

2
build/patches/Add-option-to-configure-the-ad-blocker-filters-URL.patch
View file

@ -139,7 +139,7 @@ new file mode 100644
diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
--- a/chrome/android/java/res/values/values.xml
+++ b/chrome/android/java/res/values/values.xml
@@ -38,6 +38,8 @@
@@ -32,6 +32,8 @@
<integer name="reload_button_level_reload">0</integer>
<integer name="reload_button_level_stop">1</integer>

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

@ -3,26 +3,12 @@ Date: Sat, 7 Sep 2019 15:07:42 +0200
Subject: Add option to not persist tabs across sessions
---
chrome/android/java/res/values/values.xml | 3 +++
chrome/android/java/res/xml/privacy_preferences.xml | 5 +++++
.../chrome/browser/ChromeTabbedActivity.java | 4 +++-
.../browser/privacy/settings/PrivacySettings.java | 12 ++++++++++--
.../ui/android/strings/android_chrome_strings.grd | 6 ++++++
5 files changed, 27 insertions(+), 3 deletions(-)
4 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
--- a/chrome/android/java/res/values/values.xml
+++ b/chrome/android/java/res/values/values.xml
@@ -31,6 +31,9 @@
<!-- TabSwitcher - Maximum amount to tilt tabs in over scroll in degrees. -->
<integer name="over_scroll_angle">15</integer>
+ <string name="close_tabs_on_exit_title">Close tabs on exit</string>
+ <string name="close_tabs_on_exit_summary">Don\'t persist tabs between browsing sessions</string>
+
<!-- Toolbar/AppMenu - Drawable level on reload image button -->
<integer name="reload_button_level_reload">0</integer>
<integer name="reload_button_level_stop">1</integer>
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
@ -30,7 +16,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
android:title="@string/always_incognito_title"
android:summary="@string/always_incognito_summary"
android:defaultValue="false" />
+ <org.chromium.components.browser_ui.settings.ChromeBaseCheckBoxPreference
+ <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
+ android:key="close_tabs_on_exit"
+ android:title="@string/close_tabs_on_exit_title"
+ android:summary="@string/close_tabs_on_exit_summary"

130
build/patches/Automated-domain-substitution.patch
View file

@ -3045,7 +3045,7 @@ diff --git a/chrome/common/extensions/docs/examples/extensions/gdocs/popup.html
'<entry xmlns="http://www.w3.org/2005/Atom">',
- '<category scheme="http://schemas.google.com/g/2005#kind"',
- ' term="http://schemas.google.com/docs/2007#', docType, '"/>',
+ '<category scheme="http://schemas.9oo91e.qjz9zk/g/2005#kind"',
+ '<category scheme="http://schemas.9oo91e.qjz9zk/g/2005#kind"',
+ ' term="http://schemas.9oo91e.qjz9zk/docs/2007#', docType, '"/>',
starred ? starCat : '',
'<title>', docTitle, '</title>',
@ -4107,7 +4107,7 @@ diff --git a/chrome/common/extensions/docs/templates/articles/app_codelab_images
-<p>If you want to show an external image in your app, you need to request it via <a href="https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest">XMLHttpRequest</a>,
-transform it into a <a href="https://developer.mozilla.org/en-US/docs/Web/API/Blob">Blob</a>, and create an <a href="https://developer.mozilla.org/en-US/docs/Web/API/URL.createObjectURL">ObjectURL</a>. This <code>ObjectURL</code> can be added to the DOM
+<p>If you want to show an external image in your app, you need to request it via <a href="https://developer.m0z111a.qjz9zk/en-US/docs/Web/API/XMLHttpRequest">XMLHttpRequest</a>,
+<p>If you want to show an external image in your app, you need to request it via <a href="https://developer.m0z111a.qjz9zk/en-US/docs/Web/API/XMLHttpRequest">XMLHttpRequest</a>,
+transform it into a <a href="https://developer.m0z111a.qjz9zk/en-US/docs/Web/API/Blob">Blob</a>, and create an <a href="https://developer.m0z111a.qjz9zk/en-US/docs/Web/API/URL.createObjectURL">ObjectURL</a>. This <code>ObjectURL</code> can be added to the DOM
because it refers to an in-memory item in the context of the app.</p>
@ -7072,7 +7072,7 @@ diff --git a/chrome/common/extensions/docs/templates/articles/single_purpose.htm
we launched a policy requiring Chrome extensions to have a single purpose.
In addition, starting with the May 2014 release of Chrome, we
-<a href="http://blog.chromium.org/2014/02/make-sure-to-get-your-extension-in.html">started requiring</a>
+<a href="http://blog.ch40m1um.qjz9zk/2014/02/make-sure-to-get-your-extension-in.html">started requiring</a>
+<a href="http://blog.ch40m1um.qjz9zk/2014/02/make-sure-to-get-your-extension-in.html">started requiring</a>
that extensions in Chrome for Windows be hosted in the Chrome Web Store.
Starting in Chrome 44 in July 2015,
extensions in Mac were also
@ -18134,9 +18134,9 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
- "http://www.facebook.com/",
- "http://www.google.com/",
- "http://www.youtube.com/",
+ "http://www.f8c3b00k.qjz9zk/",
+ "http://www.9oo91e.qjz9zk/",
+ "http://www.y0u1ub3.qjz9zk/",
+ "http://www.f8c3b00k.qjz9zk/",
+ "http://www.9oo91e.qjz9zk/",
+ "http://www.y0u1ub3.qjz9zk/",
"http://www.yahoo.com/",
"http://baidu.com/",
"http://www.amazon.com/",
@ -18145,18 +18145,18 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://www.tumblr.com/",
"http://163.com/",
- "http://www.google.com.hk/",
+ "http://www.9oo91e.qjz9zk.hk/",
+ "http://www.9oo91e.qjz9zk.hk/",
"http://www.mail.ru/",
"http://www.google.co.uk/",
"http://hao123.com/",
- "http://www.google.com.br/",
+ "http://www.9oo91e.qjz9zk.br/",
+ "http://www.9oo91e.qjz9zk.br/",
"http://www.amazon.co.jp/",
"http://www.weibo.com/",
"http://www.xvideos.com/",
"http://www.google.co.jp/",
- "http://www.microsoft.com/",
+ "http://www.m1cr050ft.qjz9zk/",
+ "http://www.m1cr050ft.qjz9zk/",
"http://www.delta-search.com/",
"http://www.google.fr/",
"http://www.conduit.com/",
@ -18165,7 +18165,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://www.soso.com/",
"http://www.pornhub.com/",
- "http://www.google.com.mx/",
+ "http://www.9oo91e.qjz9zk.mx/",
+ "http://www.9oo91e.qjz9zk.mx/",
"http://www.blogger.com/",
"http://www.neobux.com/",
"http://www.amazon.co.uk/",
@ -18174,12 +18174,12 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://www.alipay.com/",
"http://www.vube.com/",
- "http://www.google.com.tr/",
+ "http://www.9oo91e.qjz9zk.tr/",
+ "http://www.9oo91e.qjz9zk.tr/",
"http://www.youku.com/",
"http://www.redtube.com/",
"http://www.dailymotion.com/",
- "http://www.google.com.au/",
+ "http://www.9oo91e.qjz9zk.au/",
+ "http://www.9oo91e.qjz9zk.au/",
"http://www.adf.ly/",
"http://www.netflix.com/",
"http://www.adcash.com/",
@ -18188,19 +18188,19 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://www.weather.com/",
"http://www.pixnet.net/",
- "http://www.google.com.sa/",
+ "http://www.9oo91e.qjz9zk.sa/",
+ "http://www.9oo91e.qjz9zk.sa/",
"http://www.clkmon.com/",
"http://www.reddit.com/",
"http://www.amazon.it/",
- "http://www.google.com.eg/",
+ "http://www.9oo91e.qjz9zk.eg/",
+ "http://www.9oo91e.qjz9zk.eg/",
"http://www.booking.com/",
"http://www.google.nl/",
"http://www.douban.com/",
"http://www.amazon.cn/",
"http://www.slideshare.net/",
- "http://www.google.com.ar/",
+ "http://www.9oo91e.qjz9zk.ar/",
+ "http://www.9oo91e.qjz9zk.ar/",
"http://www.badoo.com/",
"http://www.dailymail.co.uk/",
"http://www.google.co.th/",
@ -18208,12 +18208,12 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://www.wikia.com/",
"http://www.godaddy.com/",
- "http://www.google.com.tw/",
+ "http://www.9oo91e.qjz9zk.tw/",
+ "http://www.9oo91e.qjz9zk.tw/",
"http://www.xinhuanet.com/",
"http://www.mediafire.com/",
"http://www.deviantart.com/",
- "http://www.google.com.pk/",
+ "http://www.9oo91e.qjz9zk.pk/",
+ "http://www.9oo91e.qjz9zk.pk/",
"http://www.bankofamerica.com/",
"http://www.amazon.es/",
"http://www.blogfa.com/",
@ -18222,7 +18222,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://www.google.co.ve/",
"http://www.56.com/",
- "http://www.google.com.vn/",
+ "http://www.9oo91e.qjz9zk.vn/",
+ "http://www.9oo91e.qjz9zk.vn/",
"http://www.google.gr/",
"http://www.comcast.net/",
"http://www.torrentz.eu/",
@ -18231,7 +18231,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://www.answers.com/",
"http://www.amazon.ca/",
- "http://www.mozilla.org/",
+ "http://www.m0z111a.qjz9zk/",
+ "http://www.m0z111a.qjz9zk/",
"http://www.guardian.co.uk/",
"http://www.stumbleupon.com/",
"http://www.hardsextube.com/",
@ -18240,12 +18240,12 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://www.search-results.com/",
"http://www.fiverr.com/",
- "http://www.google.com.ua/",
+ "http://www.9oo91e.qjz9zk.ua/",
+ "http://www.9oo91e.qjz9zk.ua/",
"http://www.files.wordpress.com/",
"http://www.onlineaway.net/",
"http://www.nbcnews.com/",
- "http://www.google.com.co/",
+ "http://www.9oo91e.qjz9zk.co/",
+ "http://www.9oo91e.qjz9zk.co/",
"http://www.hootsuite.com/",
"http://www.4dsply.com/",
"http://www.google.ro/",
@ -18254,11 +18254,11 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://www.addthis.com/",
"http://zol.com.cn/",
- "http://www.google.com.ng/",
+ "http://www.9oo91e.qjz9zk.ng/",
+ "http://www.9oo91e.qjz9zk.ng/",
"http://www.soundcloud.com/",
"http://www.onclickads.net/",
- "http://www.google.com.ph/",
+ "http://www.9oo91e.qjz9zk.ph/",
+ "http://www.9oo91e.qjz9zk.ph/",
"http://www.dmm.co.jp/",
"http://www.reference.com/",
"http://www.google.be/",
@ -18267,7 +18267,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://www.sweetim.com/",
"http://www.aweber.com/",
- "http://www.google.com.my/",
+ "http://www.9oo91e.qjz9zk.my/",
+ "http://www.9oo91e.qjz9zk.my/",
"http://www.pandora.com/",
"http://www.w3schools.com/",
"http://www.pengyou.com/",
@ -18276,7 +18276,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://www.warriorforum.com/",
"http://www.statcounter.com/",
- "http://www.google.com.pe/",
+ "http://www.9oo91e.qjz9zk.pe/",
+ "http://www.9oo91e.qjz9zk.pe/",
"http://www.libero.it/",
"http://www.thefreedictionary.com/",
"http://www.soku.com/",
@ -18285,7 +18285,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://www.uploaded.net/",
"http://www.bild.de/",
- "http://www.google.com.bd/",
+ "http://www.9oo91e.qjz9zk.bd/",
+ "http://www.9oo91e.qjz9zk.bd/",
"http://www.google.at/",
"http://www.webcrawler.com/",
"http://www.t-online.de/",
@ -18294,7 +18294,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://www.salesforce.com/",
"http://www.scribd.com/",
- "http://www.google.com.sg/",
+ "http://www.9oo91e.qjz9zk.sg/",
+ "http://www.9oo91e.qjz9zk.sg/",
"http://it168.com/",
"http://www.goodreads.com/",
"http://www.target.com/",
@ -18303,7 +18303,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://www.narod.ru/",
"http://www.china.com/",
- "http://www.doubleclick.com/",
+ "http://www.60u613cl1c4.c0m.qjz9zk/",
+ "http://www.60u613cl1c4.c0m.qjz9zk/",
"http://www.cam4.com/",
"http://www.google.ie/",
"http://dangdang.com/",
@ -18312,7 +18312,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://www.admagnet.net/",
"http://rottentomatoes.com/",
- "http://google.com.kw/",
+ "http://9oo91e.qjz9zk.kw/",
+ "http://9oo91e.qjz9zk.kw/",
"http://www.cloob.com/",
"http://www.nokia.com/",
"http://wetter.com/",
@ -18321,7 +18321,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://immobilienscout24.de/",
"http://www.google.kz/",
- "http://goo.gl/",
+ "http://goo.gl.qjz9zk/",
+ "http://goo.gl.qjz9zk/",
"http://zwaar.net/",
"http://www.bankmellat.ir/",
"http://alphaporno.com/",
@ -18330,7 +18330,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://www.sky.com/",
"http://www.marketwatch.com/",
- "http://www.google.com.ec/",
+ "http://www.9oo91e.qjz9zk.ec/",
+ "http://www.9oo91e.qjz9zk.ec/",
"http://www.cbslocal.com/",
"http://www.zhihu.com/",
"http://www.888poker.com/",
@ -18339,7 +18339,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://www.drom.ru/",
"http://www.weather.gov/",
- "http://gstatic.com/",
+ "http://95tat1c.qjz9zk/",
+ "http://95tat1c.qjz9zk/",
"http://www.amung.us/",
"http://www.traidnt.net/",
"http://www.ovh.net/",
@ -18348,7 +18348,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://www.bannersbroker.com/",
"http://www.kohls.com/",
- "http://www.google.com.do/",
+ "http://www.9oo91e.qjz9zk.do/",
+ "http://www.9oo91e.qjz9zk.do/",
"http://www.dealfish.co.th/",
"http://19lou.com/",
"http://www.okwave.jp/",
@ -18357,7 +18357,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://sanook.com/",
"http://ria.ru/",
- "http://google.com.qa/",
+ "http://9oo91e.qjz9zk.qa/",
+ "http://9oo91e.qjz9zk.qa/",
"http://jquery.com/",
"http://pinshan.com/",
"http://onlylady.com/",
@ -18366,7 +18366,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://www.webalta.ru/",
"http://www.usbank.com/",
- "http://www.google.com.ly/",
+ "http://www.9oo91e.qjz9zk.ly/",
+ "http://www.9oo91e.qjz9zk.ly/",
"http://www.pantip.com/",
"http://aftonbladet.se/",
"http://scoop.it/",
@ -18375,7 +18375,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://www.tinypic.com/",
"http://www.meilishuo.com/",
- "http://googleadservices.com/",
+ "http://9oo91eadservices.qjz9zk/",
+ "http://9oo91eadservices.qjz9zk/",
"http://www.boston.com/",
"http://www.chron.com/",
"http://www.breitbart.com/",
@ -18384,7 +18384,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://www.allocine.fr/",
"http://www.slutload.com/",
- "http://www.google.com.gt/",
+ "http://www.9oo91e.qjz9zk.gt/",
+ "http://www.9oo91e.qjz9zk.gt/",
"http://www.santabanta.com/",
"http://www.stardoll.com/",
"http://www.polyvore.com/",
@ -18393,7 +18393,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://www.kbb.com/",
"http://www.seasonvar.ru/",
- "http://www.android.com/",
+ "http://www.8n6r01d.qjz9zk/",
+ "http://www.8n6r01d.qjz9zk/",
"http://www.egrana.com.br/",
"http://www.ettoday.net/",
"http://www.webstatsdomain.net/",
@ -18402,7 +18402,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://www.planetminecraft.com/",
"http://www.optimum.net/",
- "http://www.google.com.pr/",
+ "http://www.9oo91e.qjz9zk.pr/",
+ "http://www.9oo91e.qjz9zk.pr/",
"http://mthai.com/",
"http://www.onlinecreditcenter6.com/",
"http://www.tharunaya.co.uk/",
@ -18411,7 +18411,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://www.heise.de/",
"http://www.wikispaces.com/",
- "http://www.google.com.bo/",
+ "http://www.9oo91e.qjz9zk.bo/",
+ "http://www.9oo91e.qjz9zk.bo/",
"http://www.skyscrapercity.com/",
"http://www.zaobao.com/",
"http://www.pirateproxy.net/",
@ -18420,12 +18420,12 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://www.mobileaziende.it/",
"http://www.officialsurvey.org/",
- "http://googleapis.com/",
+ "http://9oo91eapis.qjz9zk/",
+ "http://9oo91eapis.qjz9zk/",
"http://www.mufg.jp/",
"http://www.jobsdb.com/",
"http://www.yahoo.com.cn/",
- "http://www.google.com.sv/",
+ "http://www.9oo91e.qjz9zk.sv/",
+ "http://www.9oo91e.qjz9zk.sv/",
"http://www.freejobalert.com/",
"http://www.walla.co.il/",
"http://www.hollywoodreporter.com/",
@ -18434,7 +18434,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://www.nownews.com/",
"http://www.bc.vc/",
- "http://www.google.com.af/",
+ "http://www.9oo91e.qjz9zk.af/",
+ "http://www.9oo91e.qjz9zk.af/",
"http://www.ulmart.ru/",
"http://www.estadao.com.br/",
"http://www.politico.com/",
@ -18443,7 +18443,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://www.seobuilding.ru/",
"http://www.t411.me/",
- "http://googlesyndication.com/",
+ "http://9oo91esyndication.qjz9zk/",
+ "http://9oo91esyndication.qjz9zk/",
"http://delfi.lt/",
"http://www.eqla3.com/",
"http://www.ali213.net/",
@ -18452,7 +18452,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://www.economist.com/",
"http://www.zeit.de/",
- "http://www.google.com.uy/",
+ "http://www.9oo91e.qjz9zk.uy/",
+ "http://www.9oo91e.qjz9zk.uy/",
"http://www.pinoy-ako.info/",
"http://www.lazada.co.id/",
"http://www.filgoal.com/",
@ -18461,7 +18461,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://www.hawaaworld.com/",
"http://www.freeonlinegames.com/",
- "http://www.google.com.lb/",
+ "http://www.9oo91e.qjz9zk.lb/",
+ "http://www.9oo91e.qjz9zk.lb/",
"http://www.oricon.co.jp/",
"http://www.apple.com.cn/",
"http://www.ab-in-den-urlaub.de/",
@ -18470,7 +18470,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://www.avangate.com/",
"http://www.gandul.info/",
- "http://www.google.com.gh/",
+ "http://www.9oo91e.qjz9zk.gh/",
+ "http://www.9oo91e.qjz9zk.gh/",
"http://www.mybigcommerce.com/",
"http://www.homeaway.com/",
"http://www.wikitravel.org/",
@ -18479,7 +18479,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://www.mint.com/",
"http://www.gorillavid.in/",
- "http://www.google.com.om/",
+ "http://www.9oo91e.qjz9zk.om/",
+ "http://www.9oo91e.qjz9zk.om/",
"http://www.blogbigtime.com/",
"http://www.books.com.tw/",
"http://www.korrespondent.net/",
@ -18488,7 +18488,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://www.8684.cn/",
"http://www.rajasthan.gov.in/",
- "http://www.youtube.com/user/PewDiePie/",
+ "http://www.y0u1ub3.qjz9zk/user/PewDiePie/",
+ "http://www.y0u1ub3.qjz9zk/user/PewDiePie/",
"http://www.zonealarm.com/",
"http://www.locaweb.com.br/",
"http://logme.in/",
@ -18497,7 +18497,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://www.myhabit.com/",
"http://www.kinomaniak.tv/",
- "http://www.googlecode.com/",
+ "http://www.9oo91ecode.qjz9zk/",
+ "http://www.9oo91ecode.qjz9zk/",
"http://www.kddi.com/",
"http://www.wyborcza.biz/",
"http://www.gtbank.com/",
@ -18506,7 +18506,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://www.longtailvideo.com/",
"http://www.yengo.com/",
- "http://www.listentoyoutube.com/",
+ "http://www.listentoy0u1ub3.qjz9zk/",
+ "http://www.listentoy0u1ub3.qjz9zk/",
"http://www.dreamhost.com/",
"http://www.cari.com.my/",
"http://www.sergeymavrodi.com/",
@ -18515,7 +18515,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://www.seoclerks.com/",
"http://www.yootheme.com/",
- "http://www.google.com.py/",
+ "http://www.9oo91e.qjz9zk.py/",
+ "http://www.9oo91e.qjz9zk.py/",
"http://www.beemp3.com/",
"http://www.yepme.com/",
"http://www.alef.ir/",
@ -18524,7 +18524,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://www.28tui.com/",
"http://www.shopzilla.com/",
- "http://www.google.com.ni/",
+ "http://www.9oo91e.qjz9zk.ni/",
+ "http://www.9oo91e.qjz9zk.ni/",
"http://www.lycos.com/",
"http://www.gucheng.com/",
"http://www.rajanews.com/",
@ -18533,12 +18533,12 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://www.redorbit.com/",
"http://www.inboxdollars.com/",
- "http://www.google.com.bh/",
+ "http://www.9oo91e.qjz9zk.bh/",
+ "http://www.9oo91e.qjz9zk.bh/",
"http://www.pcanalysis.net/",
"http://www.acer.com/",
"http://www.jizzbell.com/",
- "http://www.google.com.kh/",
+ "http://www.9oo91e.qjz9zk.kh/",
+ "http://www.9oo91e.qjz9zk.kh/",
"http://www.mappy.com/",
"http://www.day.az/",
"http://www.euronews.com/",
@ -18547,7 +18547,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://www.filesonar.com/",
"http://www.hsbccreditcard.com/",
- "http://www.google.com.np/",
+ "http://www.9oo91e.qjz9zk.np/",
+ "http://www.9oo91e.qjz9zk.np/",
"http://www.parperfeito.com.br/",
"http://www.sciencedaily.com/",
"http://www.realgfporn.com/",
@ -18556,7 +18556,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://www.pornbb.org/",
"http://www.formspring.me/",
- "http://www.google.com.cy/",
+ "http://www.9oo91e.qjz9zk.cy/",
+ "http://www.9oo91e.qjz9zk.cy/",
"http://www.purepeople.com/",
"http://www.epnet.com/",
"http://www.penny-arcade.com/",
@ -18565,7 +18565,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://www.gungho.jp/",
"http://www.mk.co.kr/",
- "http://www.googlegroups.com/",
+ "http://www.9oo91egroups.qjz9zk/",
+ "http://www.9oo91egroups.qjz9zk/",
"http://www.animoto.com/",
"http://www.alquds.co.uk/",
"http://www.newsday.com/",
@ -18574,7 +18574,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://www.farecompare.com/",
"http://www.xinjunshi.com/",
- "http://www.youtube.com/user/SkyDoesMinecraft/",
+ "http://www.y0u1ub3.qjz9zk/user/SkyDoesMinecraft/",
+ "http://www.y0u1ub3.qjz9zk/user/SkyDoesMinecraft/",
"http://www.vidxden.com/",
"http://www.pvrcinemas.com/",
"http://chachaba.com/",
@ -18583,7 +18583,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://www.oszone.net/",
"http://www.teamtreehouse.com/",
- "http://www.youtube.com/user/BlueXephos/",
+ "http://www.y0u1ub3.qjz9zk/user/BlueXephos/",
+ "http://www.y0u1ub3.qjz9zk/user/BlueXephos/",
"http://www.humanservices.gov.au/",
"http://www.bostonherald.com/",
"http://www.kafeteria.pl/",
@ -18592,7 +18592,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://www.iafd.com/",
"http://www.casertex.com/",
- "http://www.gmail.com/",
+ "http://www.9ma1l.qjz9zk/",
+ "http://www.9ma1l.qjz9zk/",
"http://www.modhoster.de/",
"http://www.post-gazette.com/",
"http://www.digikey.com/",
@ -18601,7 +18601,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://www.ok-porn.com/",
"http://www.tutorialzine.com/",
- "http://www.google.com.bn/",
+ "http://www.9oo91e.qjz9zk.bn/",
+ "http://www.9oo91e.qjz9zk.bn/",
"http://www.site5.com/",
"http://www.trafficjunky.net/",
"http://www.xueqiu.com/",
@ -18610,7 +18610,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://leiting001.com/",
"http://www.ifttt.com/",
- "http://www.google.com.mm/",
+ "http://www.9oo91e.qjz9zk.mm/",
+ "http://www.9oo91e.qjz9zk.mm/",
"http://www.gizbot.com/",
"http://www.games2win.com/",
"http://www.stiforp.com/",
@ -18619,7 +18619,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://www.newindianexpress.com/",
"http://www.washingtonexaminer.com/",
- "http://www.mozillazine.org/",
+ "http://www.m0z111azine.qjz9zk/",
+ "http://www.m0z111azine.qjz9zk/",
"http://www.mg.co.za/",
"http://www.newalbumreleases.net/",
"http://www.trombi.com/",
@ -18628,7 +18628,7 @@ diff --git a/tools/perf/page_sets/alexa1-10000-urls.json b/tools/perf/page_sets/
"http://www.tweepi.com/",
"http://www.bobfilm.net/",
- "http://www.phandroid.com/",
+ "http://www.ph8n6r01d.qjz9zk/",
+ "http://www.ph8n6r01d.qjz9zk/",
"http://www.obozrevatel.com/",
"http://www.elitedaily.com/",
"http://www.tcfexpress.com/",

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

@ -9,7 +9,10 @@ Disable CrowdDeny feature
.../res/xml/google_services_preferences.xml | 20 ------
.../java/res/xml/privacy_preferences.xml | 11 ---
.../res/xml/sync_and_services_preferences.xml | 20 ------
.../EnhancedProtectionPromoController.java | 8 ---
.../EnhancedProtectionPromoUtils.java | 3 +-
.../privacy/settings/PrivacySettings.java | 55 ++------------
.../SafeBrowsingSettingsLauncher.java | 9 ---
.../sync/settings/GoogleServicesSettings.java | 10 +--
.../settings/SyncAndServicesSettings.java | 9 +--
.../android/chrome_main_delegate_android.cc | 1 +
@ -19,6 +22,7 @@ Disable CrowdDeny feature
chrome/browser/browser_process.h | 7 --
chrome/browser/browser_process_impl.cc | 29 --------
chrome/browser/browser_process_impl.h | 4 --
.../chrome_browsing_data_remover_delegate.cc | 2 +
.../browser/chrome_content_browser_client.cc | 28 ++++----
...ontent_browser_client_receiver_bindings.cc | 2 +
.../file_type_policies_component_installer.cc | 16 +----
@ -41,6 +45,7 @@ Disable CrowdDeny feature
...me_native_file_system_permission_context.h | 3 +
...ial_comparison_cert_verifier_controller.cc | 3 -
.../chrome_password_manager_client.cc | 2 +
...ve_origin_permission_revocation_request.cc | 2 +
.../permissions/chrome_permissions_client.cc | 8 ---
.../permissions/chrome_permissions_client.h | 3 -
...hrome_browser_main_extra_parts_profiles.cc | 1 -
@ -52,10 +57,11 @@ Disable CrowdDeny feature
.../android/safe_browsing_bridge.cc | 51 -------------
.../download_protection_service.cc | 7 --
.../download_protection_service.h | 5 --
.../url_lookup_service_factory.cc | 4 ++
.../safety_check/SafetyCheckMediator.java | 25 -------
.../ssl/sct_reporting_service_factory.cc | 11 +--
.../browser/ssl/security_state_tab_helper.cc | 2 +
.../chrome_subresource_filter_client.cc | 1 +
.../chrome_subresource_filter_client.cc | 4 ++
chrome/browser/ui/BUILD.gn | 1 -
.../strings/android_chrome_strings.grd | 21 ------
chrome/browser/ui/tab_helpers.cc | 8 ---
@ -64,13 +70,14 @@ Disable CrowdDeny feature
.../chrome_content_renderer_client.cc | 2 +
.../permissions/permission_request_manager.cc | 28 ++++++--
components/safe_browsing/core/features.cc | 2 +-
.../safe_browsing/core/file_type_policies.cc | 3 +-
.../content/captive_portal_blocking_page.cc | 7 --
.../content/cert_report_helper.cc | 2 -
.../unified_consent_service.cc | 2 +-
.../native_file_system_file_writer_impl.cc | 50 +------------
.../native_file_system_file_writer_impl.h | 14 +---
.../native_file_system_permission_context.h | 6 --
64 files changed, 180 insertions(+), 660 deletions(-)
71 files changed, 193 insertions(+), 681 deletions(-)
diff --git a/chrome/android/java/res/xml/google_services_preferences.xml b/chrome/android/java/res/xml/google_services_preferences.xml
--- a/chrome/android/java/res/xml/google_services_preferences.xml
@ -168,6 +175,44 @@ diff --git a/chrome/android/java/res/xml/sync_and_services_preferences.xml b/chr
<org.chromium.components.browser_ui.settings.ChromeSwitchPreference
android:key="url_keyed_anonymized_data"
android:title="@string/url_keyed_anonymized_data_title"
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/promo/enhanced_protection/EnhancedProtectionPromoController.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/promo/enhanced_protection/EnhancedProtectionPromoController.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/promo/enhanced_protection/EnhancedProtectionPromoController.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/promo/enhanced_protection/EnhancedProtectionPromoController.java
@@ -16,8 +16,6 @@ import androidx.appcompat.content.res.AppCompatResources;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.ntp.cards.promo.enhanced_protection.EnhancedProtectionPromoUtils.EnhancedProtectionPromoAction;
import org.chromium.chrome.browser.profiles.Profile;
-import org.chromium.chrome.browser.safe_browsing.metrics.SettingsAccessPoint;
-import org.chromium.chrome.browser.safe_browsing.settings.SecuritySettingsFragment;
import org.chromium.chrome.browser.settings.SettingsLauncher;
import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
import org.chromium.components.browser_ui.widget.promo.PromoCardCoordinator;
@@ -171,12 +169,6 @@ public class EnhancedProtectionPromoController {
}
private void onPrimaryButtonClicked() {
- EnhancedProtectionPromoUtils.recordEnhancedProtectionPromoEvent(
- EnhancedProtectionPromoAction.ACCEPTED);
- SettingsLauncher launcher = new SettingsLauncherImpl();
- launcher.launchSettingsActivity(mContext, SecuritySettingsFragment.class,
- SecuritySettingsFragment.createArguments(
- SettingsAccessPoint.SURFACE_EXPLORER_PROMO_SLINGER));
}
private void onPromoSeen() {
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/promo/enhanced_protection/EnhancedProtectionPromoUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/promo/enhanced_protection/EnhancedProtectionPromoUtils.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/promo/enhanced_protection/EnhancedProtectionPromoUtils.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/promo/enhanced_protection/EnhancedProtectionPromoUtils.java
@@ -65,8 +65,7 @@ final class EnhancedProtectionPromoUtils {
// TODO(bdea): If the user has pressed "Continue" and not selected Enhanced Protection,
// should we still show the promo.
return (profile != null) && !UserPrefs.get(profile).getBoolean(Pref.SAFE_BROWSING_ENHANCED)
- && !isPromoDismissedInSharedPreference() && (timesSeen <= maxImpressions)
- && !SafeBrowsingBridge.isSafeBrowsingManaged();
+ && !isPromoDismissedInSharedPreference() && (timesSeen <= maxImpressions);
}
static boolean isPromoDismissedInSharedPreference() {
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
@ -258,13 +303,38 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
- getPreferenceScreen().removePreference(usageStatsPref);
- }
- }
+ ChromeBaseCheckBoxPreference closeTabsOnExitPref =
+ (ChromeBaseCheckBoxPreference) findPreference(PREF_CLOSE_TABS_ON_EXIT);
+ ChromeSwitchPreference closeTabsOnExitPref =
+ (ChromeSwitchPreference) findPreference(PREF_CLOSE_TABS_ON_EXIT);
+ closeTabsOnExitPref.setOnPreferenceChangeListener(this);
+ closeTabsOnExitPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
}
private ChromeManagedPreferenceDelegate createManagedPreferenceDelegate() {
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingSettingsLauncher.java b/chrome/android/java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingSettingsLauncher.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingSettingsLauncher.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingSettingsLauncher.java
@@ -6,8 +6,6 @@ package org.chromium.chrome.browser.safe_browsing;
import android.content.Context;
import org.chromium.base.annotations.CalledByNative;
-import org.chromium.chrome.browser.safe_browsing.metrics.SettingsAccessPoint;
-import org.chromium.chrome.browser.safe_browsing.settings.SecuritySettingsFragment;
import org.chromium.chrome.browser.settings.SettingsLauncher;
import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
import org.chromium.content_public.browser.WebContents;
@@ -21,12 +19,5 @@ public class SafeBrowsingSettingsLauncher {
@CalledByNative
private static void showSafeBrowsingSettings(WebContents webContents) {
- WindowAndroid window = webContents.getTopLevelNativeWindow();
- if (window == null) return;
- Context currentContext = window.getContext().get();
- SettingsLauncher settingsLauncher = new SettingsLauncherImpl();
- settingsLauncher.launchSettingsActivity(currentContext, SecuritySettingsFragment.class,
- SecuritySettingsFragment.createArguments(
- SettingsAccessPoint.SECURITY_INTERSTITIAL));
}
}
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/GoogleServicesSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/GoogleServicesSettings.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/GoogleServicesSettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/GoogleServicesSettings.java
@ -526,6 +596,22 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_proc
bool created_subresource_filter_ruleset_service_ = false;
std::unique_ptr<subresource_filter::RulesetService>
subresource_filter_ruleset_service_;
diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
@@ -658,10 +658,12 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
base::RecordAction(UserMetricsAction("ClearBrowsingData_Cookies"));
network::mojom::NetworkContext* safe_browsing_context = nullptr;
+#if BUILDFLAG(FULL_SAFE_BROWSING)
safe_browsing::SafeBrowsingService* sb_service =
g_browser_process->safe_browsing_service();
if (sb_service)
safe_browsing_context = sb_service->GetNetworkContext(profile_);
+#endif
browsing_data::RemoveEmbedderCookieData(
delete_begin, delete_end, filter_builder, host_content_settings_map_,
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@ -1589,6 +1675,25 @@ diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b
if (log_manager_->IsLoggingActive()) {
password_manager::BrowserSavePasswordProgressLogger logger(
diff --git a/chrome/browser/permissions/abusive_origin_permission_revocation_request.cc b/chrome/browser/permissions/abusive_origin_permission_revocation_request.cc
--- a/chrome/browser/permissions/abusive_origin_permission_revocation_request.cc
+++ b/chrome/browser/permissions/abusive_origin_permission_revocation_request.cc
@@ -122,6 +122,7 @@ void AbusiveOriginPermissionRevocationRequest::CheckAndRevokeIfAbusive() {
return;
}
+#if BUILDFLAG(FULL_SAFE_BROWSING)
CrowdDenyPreloadData* crowd_deny = CrowdDenyPreloadData::GetInstance();
permissions::PermissionUmaUtil::RecordCrowdDenyIsLoadedAtAbuseCheckTime(
crowd_deny->is_loaded_from_disk());
@@ -147,6 +148,7 @@ void AbusiveOriginPermissionRevocationRequest::CheckAndRevokeIfAbusive() {
return;
}
}
+#endif
std::move(callback_).Run(Outcome::PERMISSION_NOT_REVOKED);
}
diff --git a/chrome/browser/permissions/chrome_permissions_client.cc b/chrome/browser/permissions/chrome_permissions_client.cc
--- a/chrome/browser/permissions/chrome_permissions_client.cc
+++ b/chrome/browser/permissions/chrome_permissions_client.cc
@ -1930,6 +2035,27 @@ diff --git a/chrome/browser/safe_browsing/download_protection/download_protectio
SafeBrowsingService* sb_service_;
// These pointers may be NULL if SafeBrowsing is disabled.
scoped_refptr<SafeBrowsingUIManager> ui_manager_;
diff --git a/chrome/browser/safe_browsing/url_lookup_service_factory.cc b/chrome/browser/safe_browsing/url_lookup_service_factory.cc
--- a/chrome/browser/safe_browsing/url_lookup_service_factory.cc
+++ b/chrome/browser/safe_browsing/url_lookup_service_factory.cc
@@ -50,6 +50,7 @@ RealTimeUrlLookupServiceFactory::RealTimeUrlLookupServiceFactory()
KeyedService* RealTimeUrlLookupServiceFactory::BuildServiceInstanceFor(
content::BrowserContext* context) const {
+#if BUILDFLAG(FULL_SAFE_BROWSING)
if (!g_browser_process->safe_browsing_service()) {
return nullptr;
}
@@ -74,6 +75,9 @@ KeyedService* RealTimeUrlLookupServiceFactory::BuildServiceInstanceFor(
GetProfileManagementStatus(browser_policy_connector),
is_under_advanced_protection, profile->IsOffTheRecord(),
g_browser_process->variations_service());
+#else
+ return nullptr;
+#endif
}
} // namespace safe_browsing
diff --git a/chrome/browser/safety_check/android/java/src/org/chromium/chrome/browser/safety_check/SafetyCheckMediator.java b/chrome/browser/safety_check/android/java/src/org/chromium/chrome/browser/safety_check/SafetyCheckMediator.java
--- a/chrome/browser/safety_check/android/java/src/org/chromium/chrome/browser/safety_check/SafetyCheckMediator.java
+++ b/chrome/browser/safety_check/android/java/src/org/chromium/chrome/browser/safety_check/SafetyCheckMediator.java
@ -2022,14 +2148,21 @@ diff --git a/chrome/browser/ssl/security_state_tab_helper.cc b/chrome/browser/ss
diff --git a/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc b/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc
--- a/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc
+++ b/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc
@@ -97,6 +97,7 @@ ChromeSubresourceFilterClient::OnPageActivationComputed(
subresource_filter::mojom::ActivationLevel::kEnabled;
*decision = subresource_filter::ActivationDecision::FORCED_ACTIVATION;
}
@@ -167,10 +167,14 @@ void ChromeSubresourceFilterClient::AllowlistByContentSettings(
const scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager>
ChromeSubresourceFilterClient::GetSafeBrowsingDatabaseManager() {
+#if BUILDFLAG(FULL_SAFE_BROWSING)
safe_browsing::SafeBrowsingService* safe_browsing_service =
g_browser_process->safe_browsing_service();
return safe_browsing_service ? safe_browsing_service->database_manager()
: nullptr;
+#else
+ return nullptr;
+#endif
}
const GURL& url(navigation_handle->GetURL());
void ChromeSubresourceFilterClient::ToggleForceActivationInCurrentWebContents(
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@ -2276,6 +2409,19 @@ diff --git a/components/safe_browsing/core/features.cc b/components/safe_browsin
const base::Feature kThreatDomDetailsTagAndAttributeFeature{
"ThreatDomDetailsTagAttributes", base::FEATURE_DISABLED_BY_DEFAULT};
diff --git a/components/safe_browsing/core/file_type_policies.cc b/components/safe_browsing/core/file_type_policies.cc
--- a/components/safe_browsing/core/file_type_policies.cc
+++ b/components/safe_browsing/core/file_type_policies.cc
@@ -49,8 +49,7 @@ FileTypePolicies::~FileTypePolicies() {
}
std::string FileTypePolicies::ReadResourceBundle() {
- ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
- return bundle.LoadDataResourceString(IDR_DOWNLOAD_FILE_TYPES_PB);
+ return nullptr;
}
void FileTypePolicies::RecordUpdateMetrics(UpdateResult result,
diff --git a/components/security_interstitials/content/captive_portal_blocking_page.cc b/components/security_interstitials/content/captive_portal_blocking_page.cc
--- a/components/security_interstitials/content/captive_portal_blocking_page.cc
+++ b/components/security_interstitials/content/captive_portal_blocking_page.cc

34
build/patches/Disable-sync-services-menu-entry.patch
View file

@ -3,9 +3,10 @@ Date: Mon, 11 Nov 2019 23:09:48 +0100
Subject: Disable sync services menu entry
---
chrome/android/java/res/xml/main_preferences.xml | 11 ++---------
chrome/android/java/res/xml/privacy_preferences.xml | 5 -----
2 files changed, 2 insertions(+), 14 deletions(-)
.../android/java/res/xml/main_preferences.xml | 11 ++---------
.../java/res/xml/privacy_preferences.xml | 5 -----
.../sync/settings/SyncSettingsUtils.java | 17 -----------------
3 files changed, 2 insertions(+), 31 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
@ -48,6 +49,33 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
- app:allowDividerBelow="false"
- android:order="7"/>
</PreferenceScreen>
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncSettingsUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncSettingsUtils.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncSettingsUtils.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncSettingsUtils.java
@@ -256,23 +256,6 @@ public class SyncSettingsUtils {
}
boolean syncEnabled = AndroidSyncSettings.get().isSyncEnabled();
- if (syncEnabled) {
- if (!profileSyncService.isSyncActive()) {
- return res.getString(R.string.sync_setup_progress);
- }
-
- if (profileSyncService.isPassphraseRequiredForPreferredDataTypes()) {
- return res.getString(R.string.sync_need_passphrase);
- }
-
- if (profileSyncService.isTrustedVaultKeyRequiredForPreferredDataTypes()) {
- return profileSyncService.isEncryptEverythingEnabled()
- ? context.getString(R.string.sync_error_card_title)
- : context.getString(R.string.sync_passwords_error_card_title);
- }
-
- return context.getString(R.string.sync_and_services_summary_sync_on);
- }
return context.getString(R.string.sync_is_disabled);
}
--
2.17.1

10
build/patches/Flag-for-always-desktop-mode.patch
View file

@ -46,7 +46,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
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
+++ b/chrome/android/java/res/xml/main_preferences.xml
@@ -105,6 +105,11 @@
@@ -112,6 +112,11 @@
android:key="content_settings"
android:order="20"
android:title="@string/prefs_site_settings"/>
@ -104,9 +104,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
+import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
+import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
import java.util.ArrayList;
import java.util.List;
@@ -2036,11 +2039,19 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
import org.chromium.url.GURL;
@@ -2038,11 +2041,19 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
} else if (id == R.id.view_source_id) {
currentTab.getWebContents().getNavigationController().loadUrl(new LoadUrlParams("view-source:"+currentTab.getUrlString()));
} else if (id == R.id.request_desktop_site_id || id == R.id.request_desktop_site_check_id) {
@ -117,7 +117,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
- !usingDesktopUserAgent, reloadOnChange);
+ SharedPreferencesManager.getInstance().writeBoolean(
+ ChromePreferenceKeys.USERAGENT_ALWAYS_DESKTOP_MODE, !usingDesktopUserAgent);
+
+
+ final boolean stickyDesktopModeEnabled = SharedPreferencesManager.getInstance().readBoolean(
+ ChromePreferenceKeys.USERAGENT_STICKY_DESKTOP_MODE, false);
+ if (stickyDesktopModeEnabled) {

12
build/patches/Move-some-account-settings-back-to-privacy-settings.patch
View file

@ -54,7 +54,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
*/
@@ -54,6 +61,18 @@ public class PrivacySettings
private static final String PREF_PROXY_OPTIONS = "proxy";
public static final String PREF_INCOGNITO_TAB_HISTORY_ENABLED = "incognito_history_enabled";
public static final String PREF_INCOGNITO_TAB_HISTORY_ENABLED = "incognito_history_enabled";
+ // moved from SyncAndServicesSettings.java
+ private static final String PREF_SERVICES_CATEGORY = "services_category";
@ -71,7 +71,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
private static final String[] NEW_PRIVACY_PREFERENCE_ORDER = {PREF_CLEAR_BROWSING_DATA,
PREF_CAN_MAKE_PAYMENT, PREF_NETWORK_PREDICTIONS,
PREF_SECURE_DNS, PREF_DO_NOT_TRACK,
@@ -61,7 +80,8 @@ public class PrivacySettings
@@ -61,7 +80,8 @@ public static final String PREF_INCOGNITO_TAB_HISTORY_ENABLED = "incognito_histo
PREF_INCOGNITO_TAB_HISTORY_ENABLED,
PREF_ALLOW_CUSTOM_TAB_INTENTS,
PREF_CLOSE_TABS_ON_EXIT,
@ -81,7 +81,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
};
private ManagedPreferenceDelegate mManagedPreferenceDelegate;
@@ -87,6 +107,29 @@ public class PrivacySettings
@@ -87,6 +107,29 @@ public static final String PREF_INCOGNITO_TAB_HISTORY_ENABLED = "incognito_histo
mManagedPreferenceDelegate = createManagedPreferenceDelegate();
@ -111,7 +111,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
ChromeSwitchPreference canMakePaymentPref =
(ChromeSwitchPreference) findPreference(PREF_CAN_MAKE_PAYMENT);
canMakePaymentPref.setOnPreferenceChangeListener(this);
@@ -119,6 +162,11 @@ public class PrivacySettings
@@ -119,6 +162,11 @@ public static final String PREF_INCOGNITO_TAB_HISTORY_ENABLED = "incognito_histo
} else if (PREF_CAN_MAKE_PAYMENT.equals(key)) {
UserPrefs.get(Profile.getLastUsedRegularProfile())
.setBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
@ -123,7 +123,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
} else if (PREF_NETWORK_PREDICTIONS.equals(key)) {
PrivacyPreferencesManager.getInstance().setNetworkPredictionEnabled((boolean) newValue);
} else if (PREF_ALLOW_CUSTOM_TAB_INTENTS.equals(key)) {
@@ -133,6 +181,16 @@ public class PrivacySettings
@@ -133,6 +181,16 @@ public static final String PREF_INCOGNITO_TAB_HISTORY_ENABLED = "incognito_histo
return true;
}
@ -140,7 +140,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
@Override
public void onResume() {
super.onResume();
@@ -143,7 +201,7 @@ public class PrivacySettings
@@ -143,7 +201,7 @@ public static final String PREF_INCOGNITO_TAB_HISTORY_ENABLED = "incognito_histo
* Updates the summaries for several preferences.
*/
public void updateSummaries() {

21
build/patches/Remove-blocklisted-URLs-upon-bookmark-creation.patch
View file

@ -3,8 +3,8 @@ Date: Fri, 21 Aug 2020 22:39:23 +0200
Subject: Remove blocklisted URLs upon bookmark creation
---
.../chrome/browser/app/ChromeActivity.java | 15 +++++++++++++++
1 file changed, 15 insertions(+)
.../chrome/browser/app/ChromeActivity.java | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
@ -18,7 +18,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
import org.chromium.chrome.browser.tab.AccessibilityVisibilityHandler;
import org.chromium.chrome.browser.tab.Tab;
import org.chromium.chrome.browser.tab.TabDelegateFactory;
@@ -251,6 +253,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
@@ -207,6 +209,8 @@ import org.chromium.ui.widget.Toast;
import org.chromium.url.Origin;
import org.chromium.webapk.lib.client.WebApkNavigationClient;
+import org.chromium.url.GURL;
+
import java.util.ArrayList;
import java.util.List;
import java.util.function.Consumer;
@@ -251,6 +255,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
private UmaSessionStats mUmaSessionStats;
private ContextReporter mContextReporter;
@ -26,7 +35,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
private boolean mPartnerBrowserRefreshNeeded;
@@ -1230,6 +1233,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
@@ -1230,6 +1235,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
mCompositorViewHolder = null;
}
@ -38,7 +47,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
onDestroyInternal();
if (mDidAddPolicyChangeListener) {
@@ -1466,6 +1474,13 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
@@ -1466,6 +1476,13 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
return;
}
@ -47,7 +56,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
+ mMostVisitedSites =
+ SuggestionsDependencyFactory.getInstance().createMostVisitedSites(Profile.getLastUsedRegularProfile());
+ }
+ mMostVisitedSites.removeBlocklistedUrl(tabToBookmark.getOriginalUrl());
+ mMostVisitedSites.removeBlocklistedUrl(new GURL(tabToBookmark.getOriginalUrl()));
+
// Note we get user bookmark ID over just a bookmark ID here: Managed bookmarks can't be
// edited. If the current URL is only bookmarked by managed bookmarks, this will return

46
build/patches/Remove-google_services_gcm.patch
View file

@ -3,9 +3,51 @@ Date: Sun, 3 May 2020 12:15:33 +0200
Subject: Remove google_services_gcm
---
third_party/android_deps/BUILD.gn | 18 ------------------
1 file changed, 18 deletions(-)
.../browser/language/AppLocaleUtils.java | 19 -------------------
third_party/android_deps/BUILD.gn | 18 ------------------
2 files changed, 37 deletions(-)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java
@@ -8,11 +8,6 @@ import android.content.Context;
import android.preference.PreferenceManager;
import android.text.TextUtils;
-import com.google.android.play.core.splitcompat.SplitCompat;
-import com.google.android.play.core.splitinstall.SplitInstallManager;
-import com.google.android.play.core.splitinstall.SplitInstallManagerFactory;
-import com.google.android.play.core.splitinstall.SplitInstallRequest;
-
import org.chromium.base.BundleUtils;
import org.chromium.base.ContextUtils;
import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
@@ -75,25 +70,11 @@ public class AppLocaleUtils {
* @param context Activity context to enable downloaded language splits on.
*/
public static void maybeInstallActivitySplitCompat(Context context) {
- if (GlobalAppLocaleController.getInstance().isOverridden() && BundleUtils.isBundle()) {
- SplitCompat.installActivity(context);
- }
}
/**
* For bundle builds ensure that the language split for languageName is download.
*/
private static void ensureLaguageSplitInstalled(String languageName) {
- SplitInstallManager splitInstallManager =
- SplitInstallManagerFactory.create(ContextUtils.getApplicationContext());
-
- // TODO(perrier): check if languageName is already installed. https://crbug.com/1103806
- if (languageName != null) {
- SplitInstallRequest installRequest =
- SplitInstallRequest.newBuilder()
- .addLanguage(Locale.forLanguageTag(languageName))
- .build();
- splitInstallManager.startInstall(installRequest);
- }
}
}
diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.gn
--- a/third_party/android_deps/BUILD.gn
+++ b/third_party/android_deps/BUILD.gn

71
build/patches/Revert-the-removal-of-an-option-to-block-autoplay.patch
View file

@ -13,11 +13,11 @@ Subject: Revert the removal of an option to block autoplay
.../res/xml/site_settings_preferences.xml | 4 ++++
.../ContentSettingsResources.java | 5 ++++
.../site_settings/SingleCategorySettings.java | 4 ++++
.../site_settings/SingleWebsiteSettings.java | 21 +++++++++++++++++
.../site_settings/SingleWebsiteSettings.java | 22 ++++++++++++++++++
.../site_settings/SiteSettingsCategory.java | 9 +++++--
.../browser_ui/site_settings/Website.java | 8 +++++++
.../WebsitePermissionsFetcher.java | 1 +
.../WebsitePreferenceBridge.java | 12 ++++++++++
.../WebsitePreferenceBridge.java | 14 +++++++++++
.../android/website_preference_bridge.cc | 22 ++++++++++++++++++
.../strings/android/site_settings.grdp | 9 +++++++
.../core/browser/content_settings_registry.cc | 2 +-
@ -36,7 +36,7 @@ Subject: Revert the removal of an option to block autoplay
.../platform/web_content_settings_client.h | 3 +++
.../core/html/media/autoplay_policy.cc | 12 +++++++++-
.../core/html/media/autoplay_policy.h | 4 ++++
33 files changed, 153 insertions(+), 4 deletions(-)
33 files changed, 156 insertions(+), 4 deletions(-)
create mode 100644 components/browser_ui/site_settings/android/java/res/drawable-hdpi/settings_autoplay.png
create mode 100644 components/browser_ui/site_settings/android/java/res/drawable-mdpi/settings_autoplay.png
create mode 100644 components/browser_ui/site_settings/android/java/res/drawable-xhdpi/settings_autoplay.png
@ -46,7 +46,7 @@ Subject: Revert the removal of an option to block autoplay
diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/browser_ui/site_settings/android/BUILD.gn
--- a/components/browser_ui/site_settings/android/BUILD.gn
+++ b/components/browser_ui/site_settings/android/BUILD.gn
@@ -189,6 +189,11 @@ android_resources("java_resources") {
@@ -190,6 +190,11 @@ android_resources("java_resources") {
"java/res/drawable-xxxhdpi/settings_storage.png",
"java/res/drawable-xxxhdpi/settings_usb.png",
"java/res/drawable-xxxhdpi/web_asset.png",
@ -169,7 +169,7 @@ HcmV?d00001
diff --git a/components/browser_ui/site_settings/android/java/res/xml/single_website_preferences.xml b/components/browser_ui/site_settings/android/java/res/xml/single_website_preferences.xml
--- a/components/browser_ui/site_settings/android/java/res/xml/single_website_preferences.xml
+++ b/components/browser_ui/site_settings/android/java/res/xml/single_website_preferences.xml
@@ -69,6 +69,8 @@
@@ -71,6 +71,8 @@
android:key="automatic_downloads_permission_list" />
<ListPreference
android:key="protected_media_identifier_permission_list" />
@ -181,7 +181,7 @@ diff --git a/components/browser_ui/site_settings/android/java/res/xml/single_web
diff --git a/components/browser_ui/site_settings/android/java/res/xml/site_settings_preferences.xml b/components/browser_ui/site_settings/android/java/res/xml/site_settings_preferences.xml
--- a/components/browser_ui/site_settings/android/java/res/xml/site_settings_preferences.xml
+++ b/components/browser_ui/site_settings/android/java/res/xml/site_settings_preferences.xml
@@ -61,6 +61,10 @@
@@ -65,6 +65,10 @@
<org.chromium.components.browser_ui.settings.ChromeBasePreference
android:fragment="org.chromium.components.browser_ui.site_settings.SingleCategorySettings"
android:key="protected_content" />
@ -210,7 +210,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java
--- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java
+++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java
@@ -513,6 +513,8 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
@@ -533,6 +533,8 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
int resource = 0;
if (mCategory.showSites(SiteSettingsCategory.Type.AUTOMATIC_DOWNLOADS)) {
resource = R.string.website_settings_add_site_description_automatic_downloads;
@ -219,7 +219,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
} else if (mCategory.showSites(SiteSettingsCategory.Type.BACKGROUND_SYNC)) {
resource = R.string.website_settings_add_site_description_background_sync;
} else if (mCategory.showSites(SiteSettingsCategory.Type.JAVASCRIPT)) {
@@ -621,6 +623,8 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
@@ -650,6 +652,8 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
boolean exception = false;
if (mCategory.showSites(SiteSettingsCategory.Type.SOUND)) {
exception = true;
@ -240,7 +240,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
case ContentSettingsType.IDLE_DETECTION:
return "idle_detection_permission_list";
case ContentSettingsType.JAVASCRIPT:
@@ -415,6 +417,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
@@ -417,6 +419,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
setUpSoundPreference(preference);
} else if (type == ContentSettingsType.JAVASCRIPT) {
setUpJavascriptPreference(preference);
@ -249,14 +249,15 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
} else if (type == ContentSettingsType.COOKIES) {
setUpCookiePreference(preference);
} else if (type == ContentSettingsType.GEOLOCATION) {
@@ -872,6 +876,23 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
@@ -892,6 +896,24 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
}
}
+ private void setUpAutoplayPreference(Preference preference) {
+ @ContentSettingValues
+ @Nullable
+ Integer currentValue = mSite.getContentSettingPermission(ContentSettingsType.AUTOPLAY);
+ Integer currentValue = mSite.getContentSetting(
+ getSiteSettingsClient().getBrowserContextHandle(), ContentSettingsType.AUTOPLAY);
+ // In order to always show the autoplay permission, set it up with the default value if it
+ // doesn't have a current value.
+ if (currentValue == null) {
@ -280,25 +281,25 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
Type.CLIPBOARD, Type.COOKIES, Type.IDLE_DETECTION, Type.DEVICE_LOCATION,
Type.JAVASCRIPT, Type.MICROPHONE, Type.NFC, Type.NOTIFICATIONS, Type.POPUPS,
Type.PROTECTED_MEDIA, Type.SENSORS, Type.SOUND, Type.USB, Type.VIRTUAL_REALITY,
- Type.USE_STORAGE})
+ Type.USE_STORAGE, Type.AUTOPLAY})
- Type.USE_STORAGE, Type.TIMEZONE_OVERRIDE})
+ Type.USE_STORAGE, Type.TIMEZONE_OVERRIDE, Type.AUTOPLAY})
@Retention(RetentionPolicy.SOURCE)
public @interface Type {
// All updates here must also be reflected in {@link #preferenceKey(int)
@@ -71,10 +71,11 @@ public class SiteSettingsCategory {
int BLUETOOTH = 20;
@@ -72,10 +72,11 @@ public class SiteSettingsCategory {
int VIRTUAL_REALITY = 21;
int USE_STORAGE = 22;
+ int AUTOPLAY = 23;
int TIMEZONE_OVERRIDE = 23;
+ int AUTOPLAY = 24;
/**
* Number of handled categories used for calculating array sizes.
*/
- int NUM_ENTRIES = 23;
+ int NUM_ENTRIES = 24;
- int NUM_ENTRIES = 24;
+ int NUM_ENTRIES = 25;
}
private final BrowserContextHandle mBrowserContextHandle;
@@ -180,6 +181,8 @@ public class SiteSettingsCategory {
@@ -181,6 +182,8 @@ public class SiteSettingsCategory {
return ContentSettingsType.NFC;
case Type.NOTIFICATIONS:
return ContentSettingsType.NOTIFICATIONS;
@ -307,7 +308,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
case Type.POPUPS:
return ContentSettingsType.POPUPS;
case Type.PROTECTED_MEDIA:
@@ -251,6 +254,8 @@ public class SiteSettingsCategory {
@@ -254,6 +257,8 @@ public class SiteSettingsCategory {
return "nfc";
case Type.NOTIFICATIONS:
return "notifications";
@ -348,16 +349,17 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java
--- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java
+++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java
@@ -62,6 +62,8 @@ public class WebsitePreferenceBridge {
@@ -62,6 +62,9 @@ public class WebsitePreferenceBridge {
WebsitePreferenceBridgeJni.get().getNfcOrigins(browserContextHandle, list);
} else if (type == ContentSettingsType.NOTIFICATIONS) {
WebsitePreferenceBridgeJni.get().getNotificationOrigins(browserContextHandle, list);
+ } else if (type == ContentSettingsType.AUTOPLAY) {
+ WebsitePreferenceBridgeJni.get().getAutoplayOrigins(browserContextHandle, list);
+ WebsitePreferenceBridgeJni.get().getAutoplayOrigins(
+ browserContextHandle, list, false);
} else if (type == ContentSettingsType.PROTECTED_MEDIA_IDENTIFIER) {
WebsitePreferenceBridgeJni.get().getProtectedMediaIdentifierOrigins(
browserContextHandle, list);
@@ -101,6 +103,13 @@ public class WebsitePreferenceBridge {
@@ -101,6 +104,13 @@ public class WebsitePreferenceBridge {
ContentSettingsType.MEDIASTREAM_CAMERA, list, origin, embedder, isEmbargoed);
}
@ -371,15 +373,16 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
@CalledByNative
private static void insertClipboardInfoIntoList(
ArrayList<PermissionInfo> list, String origin, String embedder, boolean isEmbargoed) {
@@ -437,6 +446,7 @@ public class WebsitePreferenceBridge {
@@ -447,6 +457,8 @@ public class WebsitePreferenceBridge {
BrowserContextHandle browserContextHandle, Object list, boolean managedOnly);
void getMidiOrigins(BrowserContextHandle browserContextHandle, Object list);
void getNotificationOrigins(BrowserContextHandle browserContextHandle, Object list);
+ void getAutoplayOrigins(BrowserContextHandle browserContextHandle, Object list);
+ void getAutoplayOrigins(
+ BrowserContextHandle browserContextHandle, Object list, boolean managedOnly);
void getNfcOrigins(BrowserContextHandle browserContextHandle, Object list);
void getProtectedMediaIdentifierOrigins(
BrowserContextHandle browserContextHandle, Object list);
@@ -485,6 +495,8 @@ public class WebsitePreferenceBridge {
@@ -495,6 +507,8 @@ public class WebsitePreferenceBridge {
String embedder, int value);
void setNotificationSettingForOrigin(
BrowserContextHandle browserContextHandle, String origin, int value);
@ -469,18 +472,18 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc
+ ResourceIdentifier(), &(rules->autoplay_rules));
map->GetSettingsForOneType(ContentSettingsType::POPUPS, ResourceIdentifier(),
&(rules->popup_redirect_rules));
}
diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc
--- a/components/content_settings/core/common/content_settings.cc
+++ b/components/content_settings/core/common/content_settings.cc
@@ -177,6 +177,7 @@ bool RendererContentSettingRules::IsRendererContentSetting(
@@ -178,6 +178,7 @@ bool RendererContentSettingRules::IsRendererContentSetting(
ContentSettingsType content_type) {
return content_type == ContentSettingsType::IMAGES ||
content_type == ContentSettingsType::JAVASCRIPT ||
+ content_type == ContentSettingsType::AUTOPLAY ||
content_type == ContentSettingsType::CLIENT_HINTS ||
content_type == ContentSettingsType::POPUPS ||
content_type == ContentSettingsType::MIXEDSCRIPT;
content_type == ContentSettingsType::MIXEDSCRIPT ||
diff --git a/components/content_settings/core/common/content_settings.h b/components/content_settings/core/common/content_settings.h
--- a/components/content_settings/core/common/content_settings.h
+++ b/components/content_settings/core/common/content_settings.h
@ -491,7 +494,7 @@ diff --git a/components/content_settings/core/common/content_settings.h b/compon
+ ContentSettingsForOneType autoplay_rules;
ContentSettingsForOneType popup_redirect_rules;
ContentSettingsForOneType mixed_content_rules;
};
ContentSettingsForOneType timezone_override_rules;
diff --git a/components/content_settings/core/common/content_settings.mojom b/components/content_settings/core/common/content_settings.mojom
--- a/components/content_settings/core/common/content_settings.mojom
+++ b/components/content_settings/core/common/content_settings.mojom
@ -502,7 +505,7 @@ diff --git a/components/content_settings/core/common/content_settings.mojom b/co
+ array<ContentSettingPatternSource> autoplay_rules;
array<ContentSettingPatternSource> popup_redirect_rules;
array<ContentSettingPatternSource> mixed_content_rules;
};
array<ContentSettingPatternSource> timezone_override_rules;
diff --git a/components/content_settings/core/common/content_settings_mojom_traits.cc b/components/content_settings/core/common/content_settings_mojom_traits.cc
--- a/components/content_settings/core/common/content_settings_mojom_traits.cc
+++ b/components/content_settings/core/common/content_settings_mojom_traits.cc
@ -512,8 +515,8 @@ diff --git a/components/content_settings/core/common/content_settings_mojom_trai
data.ReadScriptRules(&out->script_rules) &&
+ data.ReadAutoplayRules(&out->autoplay_rules) &&
data.ReadPopupRedirectRules(&out->popup_redirect_rules) &&
data.ReadMixedContentRules(&out->mixed_content_rules);
}
data.ReadMixedContentRules(&out->mixed_content_rules) &&
data.ReadTimezoneOverrideRules(&out->timezone_override_rules) &&
diff --git a/components/content_settings/core/common/content_settings_mojom_traits.h b/components/content_settings/core/common/content_settings_mojom_traits.h
--- a/components/content_settings/core/common/content_settings_mojom_traits.h
+++ b/components/content_settings/core/common/content_settings_mojom_traits.h
@ -532,7 +535,7 @@ diff --git a/components/content_settings/core/common/content_settings_mojom_trai
diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc b/components/content_settings/renderer/content_settings_agent_impl.cc
--- a/components/content_settings/renderer/content_settings_agent_impl.cc
+++ b/components/content_settings/renderer/content_settings_agent_impl.cc
@@ -429,6 +429,17 @@ bool ContentSettingsAgentImpl::AllowRunningInsecureContent(
@@ -440,6 +440,17 @@ bool ContentSettingsAgentImpl::AllowRunningInsecureContent(
return false;
}

37
build/patches/Show-site-settings-for-cookies.patch
View file

@ -4,9 +4,9 @@ Subject: Show site settings for cookies
Avoid displaying info about intrusive ads
---
.../site_settings/SingleWebsiteSettings.java | 59 +++++++++----------
.../browser_ui/site_settings/Website.java | 14 +++--
2 files changed, 37 insertions(+), 36 deletions(-)
.../site_settings/SingleWebsiteSettings.java | 47 +++++++++++--------
.../browser_ui/site_settings/Website.java | 14 ++++--
2 files changed, 37 insertions(+), 24 deletions(-)
diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
--- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
@ -58,8 +58,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
+ ContentSettingsType.JAVASCRIPT)
+ ? ContentSettingValues.ALLOW
+ : ContentSettingValues.BLOCK;
}
- // Not possible to embargo JAVASCRIPT.
+ }
+ setUpListPreference(preference, currentValue, false);
+ }
+
@ -67,7 +66,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
+ @ContentSettingValues
+ @Nullable
+ Integer currentValue =
+ mSite.getContentSettingPermission(ContentSettingsType.COOKIES);
+ mSite.getContentSetting(getSiteSettingsClient().getBrowserContextHandle(), ContentSettingsType.COOKIES);
+ // Always show the cookies permission
+ if (currentValue == null) {
+ currentValue = WebsitePreferenceBridge.isCategoryEnabled(
@ -75,34 +74,12 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
+ ContentSettingsType.COOKIES)
+ ? ContentSettingValues.ALLOW
+ : ContentSettingValues.BLOCK;
+ }
}
- // Not possible to embargo JAVASCRIPT.
+ // Not possible to embargo COOKIES.
setUpListPreference(preference, currentValue, false /* isEmbargoed */);
}
@@ -932,22 +941,10 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
setUpListPreference(preference, null, false);
return;
}
- // If the ad blocker is activated, then this site will have ads blocked unless there is an
- // explicit permission disallowing the blocking.
- boolean activated = WebsitePreferenceBridge.getAdBlockingActivated(
- browserContextHandle, mSite.getAddress().getOrigin());
@ContentSettingValues
@Nullable
Integer permission = mSite.getContentSetting(browserContextHandle, ContentSettingsType.ADS);
- // If |permission| is null, there is no explicit (non-default) permission set for this site.
- // If the site is not considered a candidate for blocking, do the standard thing and remove
- // the preference.
- if (permission == null && !activated) {
- setUpListPreference(preference, null, false);
- return;
- }
-
// However, if the blocking is activated, we still want to show the permission, even if it
// is in the default state.
if (permission == null) {
diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java
--- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java
+++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java

1359
build/patches/Timezone-customization.patch Normal file
View file

File diff suppressed because it is too large Load diff

10
build/patches/build-remove-calling-untrusted-hooks.patch
View file

@ -11,7 +11,7 @@ sysroot.
diff --git a/DEPS b/DEPS
--- a/DEPS
+++ b/DEPS
@@ -94,7 +94,7 @@ vars = {
@@ -93,7 +93,7 @@ vars = {
# Check out and download nacl by default. This can be disabled e.g. with
# custom_vars.
@ -20,7 +20,7 @@ diff --git a/DEPS b/DEPS
# By default, do not check out src-internal. This can be overridden e.g. with
# custom_vars.
@@ -124,8 +124,8 @@ vars = {
@@ -123,8 +123,8 @@ vars = {
# support for other platforms may be added in the future.
'checkout_openxr' : 'checkout_win',
@ -31,7 +31,7 @@ diff --git a/DEPS b/DEPS
# By default bot checkouts the WPR archive files only when this
# flag is set True.
@@ -4249,49 +4249,6 @@ hooks = [
@@ -4248,49 +4248,6 @@ hooks = [
'sync', '--extract',
],
},
@ -81,7 +81,7 @@ diff --git a/DEPS b/DEPS
{
# Case-insensitivity for the Win SDK. Must run before win_toolchain below.
'name': 'ciopfs_linux',
@@ -4415,18 +4372,6 @@ hooks = [
@@ -4414,18 +4371,6 @@ hooks = [
'-s', 'src/buildtools/mac/clang-format.sha1',
],
},
@ -100,7 +100,7 @@ diff --git a/DEPS b/DEPS
# Pull rc binaries using checked-in hashes.
{
'name': 'rc_win',
@@ -4452,29 +4397,6 @@ hooks = [
@@ -4451,29 +4396,6 @@ hooks = [
'-s', 'src/build/toolchain/win/rc/mac/rc.sha1',
],
},

2
build/patches/disable-AdsBlockedInfoBar.patch
View file

@ -9,7 +9,7 @@ Subject: disable AdsBlockedInfoBar
diff --git a/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc b/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc
--- a/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc
+++ b/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc
@@ -192,11 +192,6 @@ void ChromeSubresourceFilterClient::LogAction(SubresourceFilterAction action) {
@@ -195,11 +195,6 @@ void ChromeSubresourceFilterClient::LogAction(SubresourceFilterAction action) {
}
void ChromeSubresourceFilterClient::ShowUI(const GURL& url) {

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

@ -4,13 +4,27 @@ Subject: ungoogled-chromium: Disable translate integration
Remove translate offer
---
.../xml/languages_detailed_preferences.xml | 5 ---
.../java/res/xml/languages_preferences.xml | 5 ---
.../language/settings/LanguageSettings.java | 43 -------------------
.../strings/android_chrome_strings.grd | 3 --
.../core/browser/translate_manager.cc | 5 ++-
.../core/browser/translate_script.cc | 16 +------
5 files changed, 5 insertions(+), 67 deletions(-)
6 files changed, 5 insertions(+), 72 deletions(-)
diff --git a/chrome/android/java/res/xml/languages_detailed_preferences.xml b/chrome/android/java/res/xml/languages_detailed_preferences.xml
--- a/chrome/android/java/res/xml/languages_detailed_preferences.xml
+++ b/chrome/android/java/res/xml/languages_detailed_preferences.xml
@@ -11,9 +11,4 @@
android:layout="@layout/languages_preference"
android:widgetLayout="@layout/accept_languages_list" />
- <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
- android:key="translate_switch"
- android:summaryOn="@string/languages_offer_translate_switch"
- android:summaryOff="@string/languages_offer_translate_switch" />
-
</PreferenceScreen>
diff --git a/chrome/android/java/res/xml/languages_preferences.xml b/chrome/android/java/res/xml/languages_preferences.xml
--- a/chrome/android/java/res/xml/languages_preferences.xml
+++ b/chrome/android/java/res/xml/languages_preferences.xml