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

updated patch with wiggle

Browse source 
added timezone-override patch
This commit is contained in:
Carmelo Messina 2020-11-16 14:45:24 +01:00
parent 997f047926
commit 461860fbe3
13 changed files with 1496 additions and 185 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

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

@ -111,7 +111,7 @@ diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/histo
+#if defined(OS_ANDROID)
+ if(profile->GetOriginalProfile()->GetPrefs()->GetBoolean(prefs::kIncognitoTabHistoryEnabled)) {
+ return HistoryServiceFactory::GetForProfile(profile, ServiceAccessType::IMPLICIT_ACCESS);
+ }
+ }
+#endif
+
if (profile->IsOffTheRecord())

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>

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/",

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

@ -3,10 +3,9 @@ Date: Mon, 11 Nov 2019 23:09:48 +0100
Subject: Disable sync services menu entry
---
.../android/java/res/xml/main_preferences.xml | 11 ++---------
.../java/res/xml/privacy_preferences.xml | 5 -----
.../sync/settings/SyncSettingsUtils.java | 18 ------------------
3 files changed, 2 insertions(+), 32 deletions(-)
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(-)
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
@ -49,34 +48,6 @@ 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
@@ -255,24 +255,6 @@ public class SyncSettingsUtils {
return res.getString(R.string.sync_data_types_off);
}
- 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

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

@ -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() {

17
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 | 19 +++++++++++++++++++
1 file changed, 19 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,15 +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;
@@ -206,6 +208,10 @@ import org.chromium.ui.modaldialog.ModalDialogManager;
import org.chromium.ui.widget.Toast;
@@ -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 org.chromium.url.GURL;
+
import java.util.ArrayList;
import java.util.List;
@@ -251,6 +257,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
import java.util.function.Consumer;
@@ -251,6 +255,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
private UmaSessionStats mUmaSessionStats;
private ContextReporter mContextReporter;
@ -34,7 +35,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
private boolean mPartnerBrowserRefreshNeeded;
@@ -1230,6 +1237,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
@@ -1230,6 +1235,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
mCompositorViewHolder = null;
}
@ -46,7 +47,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
onDestroyInternal();
if (mDidAddPolicyChangeListener) {
@@ -1466,6 +1478,13 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
@@ -1466,6 +1476,13 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
return;
}

62
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,7 +249,7 @@ 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
}
}
@ -281,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;
@ -308,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";
@ -349,7 +349,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/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);
@ -359,7 +359,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
} 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);
}
@ -373,7 +373,7 @@ 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 {
@@ -449,6 +459,8 @@ public class WebsitePreferenceBridge {
BrowserContextHandle browserContextHandle, Object list, boolean managedOnly);
void getMidiOrigins(BrowserContextHandle browserContextHandle, Object list);
void getNotificationOrigins(BrowserContextHandle browserContextHandle, Object list);
@ -382,7 +382,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
void getNfcOrigins(BrowserContextHandle browserContextHandle, Object list);
void getProtectedMediaIdentifierOrigins(
BrowserContextHandle browserContextHandle, Object list);
@@ -485,6 +495,8 @@ public class WebsitePreferenceBridge {
@@ -497,6 +509,8 @@ public class WebsitePreferenceBridge {
String embedder, int value);
void setNotificationSettingForOrigin(
BrowserContextHandle browserContextHandle, String origin, int value);
@ -472,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
@ -494,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
@ -505,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
@ -515,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
@ -535,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;
}

38
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,8 +66,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
+ @ContentSettingValues
+ @Nullable
+ Integer currentValue =
+ mSite.getContentSetting(
+ getSiteSettingsClient().getBrowserContextHandle(), ContentSettingsType.COOKIES);
+ mSite.getContentSetting(getSiteSettingsClient().getBrowserContextHandle(), ContentSettingsType.COOKIES);
+ // Always show the cookies permission
+ if (currentValue == null) {
+ currentValue = WebsitePreferenceBridge.isCategoryEnabled(
@ -76,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

1362
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) {