Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd52789b authored by csagan5's avatar csagan5
Browse files

Release 102.0.5005.67

parent 6c2d2ee3
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
# 102.0.5005.67
* dropped patch to disable mobile identity consistency by default
* fix text for blocked ads (fixes https://github.com/bromite/bromite/issues/2026)
* fix OpenSeach visited site detection bug (fixes https://github.com/bromite/bromite/issues/1994)

# 101.0.4951.69
* flag to toggle site engagement (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/2022)
* site settings to enable webGL (thanks to @uazo)
+27 −17
Original line number Diff line number Diff line
@@ -38,11 +38,11 @@ See also: https://github.com/bromite/bromite/pull/1427
 .../browser/settings/SettingsActivity.java    |   4 +
 .../HistoricalTabModelObserver.java           |   8 +-
 .../tab/tab_restore/HistoricalTabSaver.java   |   2 +-
 .../tab_restore/HistoricalTabSaverImpl.java   |  12 +-
 .../tab_restore/HistoricalTabSaverImpl.java   |  16 +-
 .../tabbed_mode/TabbedRootUiCoordinator.java  |   5 +-
 .../browser/tabmodel/ChromeTabCreator.java    |   5 +-
 .../tabmodel/TabModelSelectorImpl.java        |   3 +
 .../browser/tabmodel/TabPersistentStore.java  |  10 ++
 .../browser/tabmodel/TabPersistentStore.java  |   9 +
 .../webapps/WebappIntentDataProvider.java     |  14 ++
 chrome/browser/about_flags.cc                 |   4 +
 .../browser/android/historical_tab_saver.cc   |  21 ++-
@@ -80,7 +80,7 @@ See also: https://github.com/bromite/bromite/pull/1427
 .../omnibox/browser/base_search_provider.cc   |   2 +-
 components/omnibox/browser/search_provider.cc |   4 +-
 .../host_content_settings_map_factory.cc      |   1 +
 64 files changed, 686 insertions(+), 74 deletions(-)
 64 files changed, 688 insertions(+), 75 deletions(-)
 create mode 100644 chrome/android/java/res/xml/incognito_preferences.xml
 create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java
 create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/IncognitoSettings.java
@@ -885,7 +885,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabSaverImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabSaverImpl.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabSaverImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabSaverImpl.java
@@ -46,10 +46,10 @@ public class HistoricalTabSaverImpl implements HistoricalTabSaver {
@@ -25,6 +25,8 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
+import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
+
 /**
  * Creates historical entries in TabRestoreService.
  */
@@ -46,10 +48,10 @@ public class HistoricalTabSaverImpl implements HistoricalTabSaver {
 
     // HistoricalTabSaver implementation.
     @Override
@@ -898,7 +907,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore
     }
 
     @Override
@@ -90,7 +90,7 @@ public class HistoricalTabSaverImpl implements HistoricalTabSaver {
@@ -90,7 +92,7 @@ public class HistoricalTabSaverImpl implements HistoricalTabSaver {
 
         // If there is only a single valid tab remaining save it individually.
         if (validEntries.size() == 1 && validEntries.get(0).isSingleTab()) {
@@ -907,7 +916,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore
             return;
         }
 
@@ -107,8 +107,8 @@ public class HistoricalTabSaverImpl implements HistoricalTabSaver {
@@ -107,8 +109,8 @@ public class HistoricalTabSaverImpl implements HistoricalTabSaver {
                 CollectionUtil.integerListToIntArray(perTabGroupId), allTabs.toArray(new Tab[0]));
     }
 
@@ -918,7 +927,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore
     }
 
     /**
@@ -194,7 +194,7 @@ public class HistoricalTabSaverImpl implements HistoricalTabSaver {
@@ -116,7 +118,7 @@ public class HistoricalTabSaverImpl implements HistoricalTabSaver {
      * internal Chrome scheme, about:blank, or a native page and it cannot be incognito.
      */
     private boolean shouldSave(Tab tab) {
-        if (tab.isIncognito()) return false;
+        if (tab.isIncognito() && !AlwaysIncognitoLinkInterceptor.isAlwaysIncognito()) return false;
 
         // {@link GURL#getScheme()} is not available in unit tests.
         if (mIgnoreUrlSchemesForTesting) return true;
@@ -194,7 +196,7 @@ public class HistoricalTabSaverImpl implements HistoricalTabSaver {
 
     @NativeMethods
     interface Natives {
@@ -998,15 +1016,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabMod
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java
@@ -18,6 +18,7 @@ import androidx.core.util.AtomicFile;
 
 import org.chromium.base.Callback;
 import org.chromium.base.CallbackController;
+import org.chromium.base.ContextUtils;
 import org.chromium.base.FeatureList;
 import org.chromium.base.Log;
 import org.chromium.base.ObserverList;
@@ -58,6 +59,8 @@ import org.chromium.content_public.browser.LoadUrlParams;
@@ -58,6 +58,8 @@ import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.content_public.browser.UiThreadTaskTraits;
 import org.chromium.url.GURL;
 
@@ -1015,7 +1025,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPer
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -739,6 +742,13 @@ public class TabPersistentStore {
@@ -739,6 +741,13 @@ public class TabPersistentStore {
                 }
             }
         }
+9 −9
Original line number Diff line number Diff line
@@ -9,16 +9,16 @@ Subject: Ask user before closing all tabs
diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
--- a/chrome/browser/flags/android/chrome_feature_list.cc
+++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -457,8 +457,8 @@ const base::Feature kCastDeviceFilter{"CastDeviceFilter",
 const base::Feature kCloseAllTabsModalDialog{"CloseAllTabsModalDialog",
                                              base::FEATURE_ENABLED_BY_DEFAULT};
@@ -454,8 +454,8 @@ const base::Feature kConditionalTabStripAndroid{
 const base::Feature kCastDeviceFilter{"CastDeviceFilter",
                                       base::FEATURE_DISABLED_BY_DEFAULT};
 
-const base::Feature kCloseTabSuggestions{"CloseTabSuggestions",
-                                         base::FEATURE_DISABLED_BY_DEFAULT};
+const base::Feature kCloseTabSuggestions{"CloseTabSuggestions",              // Enabled by default in Bromite
+                                         base::FEATURE_ENABLED_BY_DEFAULT};
-const base::Feature kCloseAllTabsModalDialog{"CloseAllTabsModalDialog",
-                                             base::FEATURE_ENABLED_BY_DEFAULT};
+const base::Feature kCloseAllTabsModalDialog{"CloseAllTabsModalDialog",         // Enabled by default in Bromite
+                                             base::FEATURE_ENABLED_BY_DEFAULT}; // ^
 
 const base::Feature kCriticalPersistedTabData{
     "CriticalPersistedTabData", base::FEATURE_DISABLED_BY_DEFAULT};
 const base::Feature kCloseTabSuggestions{"CloseTabSuggestions",
                                          base::FEATURE_DISABLED_BY_DEFAULT};
--
2.25.1
+16 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ Fix RestoreForeignSessionTab by recreating the tab (issue #681)
 .../strings/android_chrome_strings.grd        |  14 +
 chrome/common/pref_names.cc                   |   3 +
 chrome/common/pref_names.h                    |   1 +
 .../strings/android/site_settings.grdp        |   4 +-
 components/component_updater/BUILD.gn         |   7 +
 .../adblock_updater_service.cc                | 271 ++++++++++++++++++
 .../adblock_updater_service.h                 | 100 +++++++
@@ -45,7 +46,7 @@ Fix RestoreForeignSessionTab by recreating the tab (issue #681)
 .../browser/subresource_filter_features.cc    | 113 +-------
 .../core/common/indexed_ruleset.cc            |   5 +-
 .../navigation_throttle_runner.cc             |   5 -
 36 files changed, 1158 insertions(+), 124 deletions(-)
 37 files changed, 1160 insertions(+), 126 deletions(-)
 create mode 100644 chrome/android/java/res/layout/adblock_editor.xml
 create mode 100644 chrome/android/java/res/xml/adblock_preferences.xml
 create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/settings/AdBlockEditor.java
@@ -685,6 +686,20 @@ diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
 extern const char kHttpsOnlyModeEnabled[];
 extern const char kImportantSitesDialogHistory[];
 extern const char kProfileCreationTime[];
diff --git a/components/browser_ui/strings/android/site_settings.grdp b/components/browser_ui/strings/android/site_settings.grdp
--- a/components/browser_ui/strings/android/site_settings.grdp
+++ b/components/browser_ui/strings/android/site_settings.grdp
@@ -247,8 +247,8 @@
   <message name="IDS_INTRUSIVE_ADS_INFORMATION" desc="The extra information at the top of the Site Details page when the site tends to show intrusive ads">
     This site shows intrusive or misleading ads
   </message>
-  <message name="IDS_WEBSITE_SETTINGS_CATEGORY_ADS_BLOCKED" desc="A setting that, if turned on, will block intrusive or misleading ads on sites that have a history of showing such ads.">
-    Block ads on sites that show intrusive or misleading ads
+  <message name="IDS_WEBSITE_SETTINGS_CATEGORY_ADS_BLOCKED" desc="A setting that, if turned on, will block ads.">
+    Block ads based on the current filters
   </message>
   <message name="IDS_WEBSITE_SETTINGS_CATEGORY_ADS_BLOCKED_LIST" desc="Summary text explaining that the Ads permission is set to block ads on some sites. To be shown in the list of permission categories.">
     Blocked on some sites
diff --git a/components/component_updater/BUILD.gn b/components/component_updater/BUILD.gn
--- a/components/component_updater/BUILD.gn
+++ b/components/component_updater/BUILD.gn
+13 −1
Original line number Diff line number Diff line
@@ -12,13 +12,14 @@ being sent and being saved to disk, although it is currently in uncalled code.
 .../embedder_support/origin_trials/features.cc  |  3 ++-
 .../render_view_context_menu_base.cc            |  3 ---
 .../aggregatable_report_sender.cc               | 17 ++++++++---------
 .../attribution_reporting/attribution_host.cc   |  1 +
 .../attribution_report_network_sender.cc        | 15 ++++++++-------
 .../attribution_storage_sql.cc                  |  2 +-
 content/browser/storage_partition_impl.cc       |  7 +------
 content/public/browser/navigation_controller.cc |  1 -
 third_party/blink/common/features.cc            |  2 +-
 .../platform/runtime_enabled_features.json5     |  9 ++++++++-
 10 files changed, 30 insertions(+), 31 deletions(-)
 11 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
--- a/chrome/browser/flags/android/chrome_feature_list.cc
@@ -96,6 +97,17 @@ diff --git a/content/browser/aggregation_service/aggregatable_report_sender.cc b
-}  // namespace content
\ No newline at end of file
+}  // namespace content
diff --git a/content/browser/attribution_reporting/attribution_host.cc b/content/browser/attribution_reporting/attribution_host.cc
--- a/content/browser/attribution_reporting/attribution_host.cc
+++ b/content/browser/attribution_reporting/attribution_host.cc
@@ -141,6 +141,7 @@ void AttributionHost::DidFinishNavigation(NavigationHandle* navigation_handle) {
     return;
   }
 
+  if ((true)) return;
   AttributionManager* attribution_manager =
       attribution_manager_provider_->GetManager(web_contents());
   if (!attribution_manager) {
diff --git a/content/browser/attribution_reporting/attribution_report_network_sender.cc b/content/browser/attribution_reporting/attribution_report_network_sender.cc
--- a/content/browser/attribution_reporting/attribution_report_network_sender.cc
+++ b/content/browser/attribution_reporting/attribution_report_network_sender.cc
Loading