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

Commit bb68ef38 authored by csagan5's avatar csagan5
Browse files

Updated draft for v91 patches

parent b4ca5cb0

build/bromite_patches_list.txt

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ ungoogled-chromium-Disable-Network-Time-Tracker.patch 
Disable-safe-browsing.patch

Skip-the-first-run-and-metrics.patch

Disable-all-promo-dialogs.patch

Disable-sync-services-menu-entry.patch

Remove-signin-and-data-saver-integrations.patch

Hide-passwords-manager-link.patch

Disable-Omaha-update-checks.patch

build/patches/Add-an-always-incognito-mode.patch

+1 −1
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/StartupTab 
         WebContents webContents =

-                WebContentsFactory.createWebContents(Profile.getLastUsedRegularProfile(), false);

+                WebContentsFactory.createWebContents(

+                    isIncognito ? profile.getPrimaryOTRProfile() : profile, 

+                    isIncognito ? profile.getPrimaryOTRProfile(true /* createIfNeeded */) : profile,

+                    false);

 

         mLoadUrlParams = new LoadUrlParams(url.getValidSpecOrEmpty());

build/patches/Add-bookmark-import-export-actions.patch

+8 −8
Original line number Diff line number Diff line
@@ -912,15 +912,15 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse 
+  //NOTE: extension and description are not used on Android, thus not set

+  ui::SelectFileDialog::FileTypeInfo file_type_info;

+

+  const std::vector<base::string16> v_accept_types = { base::UTF8ToUTF16("text/html") };

+  const std::vector<std::u16string> v_accept_types = { base::UTF8ToUTF16("text/html") };

+

+  // Android needs the original MIME types and an additional capture value.

+  std::pair<std::vector<base::string16>, bool> accept_types =

+  std::pair<std::vector<std::u16string>, bool> accept_types =

+      std::make_pair(v_accept_types, /* use_media_capture */ false);

+

+  select_file_dialog_->SelectFile(

+        ui::SelectFileDialog::SELECT_OPEN_FILE,

+        base::string16(),

+        std::u16string(),

+        export_path_,

+        &file_type_info,

+        0,
@@ -941,7 +941,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse 
+      ui::WindowAndroid::FromJavaWindowAndroid(java_window);

+  CHECK(window);

+

+  base::string16 export_path =

+  std::u16string export_path =

+    base::android::ConvertJavaStringToUTF16(env, j_export_path);

+

+  export_path_ = base::FilePath::FromUTF16Unsafe(export_path);
@@ -960,9 +960,9 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse 
+

+// Attempts to create a TemplateURL from the provided data. |title| is optional.

+// If TemplateURL creation fails, returns null.

+std::unique_ptr<TemplateURL> CreateTemplateURL(const base::string16& url,

+                                               const base::string16& keyword,

+                                               const base::string16& title) {

+std::unique_ptr<TemplateURL> CreateTemplateURL(const std::u16string& url,

+                                               const std::u16string& keyword,

+                                               const std::u16string& title) {

+  if (url.empty() || keyword.empty())

+    return nullptr;

+  TemplateURLData data;
@@ -1379,7 +1379,7 @@ diff --git a/chrome/browser/importer/profile_writer.h b/chrome/browser/importer/ 
+  virtual void AddBookmarksWithModel(

+      bookmarks::BookmarkModel* model,

+      const std::vector<ImportedBookmarkEntry>& bookmarks,

+      const base::u16string& top_level_folder_name);

+      const std::u16string& top_level_folder_name);

+

   virtual void AddFavicons(const favicon_base::FaviconUsageDataList& favicons);

build/patches/Bromite-AdBlockUpdaterService.patch

+2 −2
Original line number Diff line number Diff line
@@ -1487,7 +1487,7 @@ diff --git a/components/subresource_filter/content/browser/content_subresource_f 
+    {

+      subresource_filter::ActivationDecision ignored_decision;

+      mojom::ActivationState ad_filtering_state;

+      ad_filtering_state.activation_level = client_->GetProfileInteractionManager()->OnPageActivationComputed(

+      ad_filtering_state.activation_level = profile_interaction_manager_->OnPageActivationComputed(

+	      navigation_handle, mojom::ActivationLevel::kEnabled, &ignored_decision);

+      throttle->NotifyPageActivationWithRuleset(EnsureRulesetHandle(),

+                                                ad_filtering_state);
@@ -1665,7 +1665,7 @@ diff --git a/components/subresource_filter/content/browser/verified_ruleset_deal 
                "VerifiedRulesetDealer::OpenAndSetRulesetFile", "file_valid",

                file->IsValid());

+

+  LOG(INFO) << "OpenAndSetRulesetFile: " << file_path << " is valid: " << file.IsValid();

+  LOG(INFO) << "OpenAndSetRulesetFile: " << file_path << " is valid: " << file->IsValid();

+

   if (file->IsValid()) {

     SetRulesetFile(file->Duplicate());

build/patches/Disable-sync-services-menu-entry.patch

deleted100644 → 0
+0 −52
Original line number Diff line number Diff line 
From: csagan5 <32685696+csagan5@users.noreply.github.com>

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 |  4 ----

 2 files changed, 2 insertions(+), 13 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

+++ b/chrome/android/java/res/xml/main_preferences.xml

@@ -13,7 +13,8 @@

     <PreferenceCategory

         android:key="account_section"

         android:order="1"

-        android:title="@string/prefs_section_account"/>

+        android:title="@string/prefs_section_account"

+        app:isPreferenceVisible="false"/>

     <PreferenceCategory

         android:key="account_and_google_services_section"

         android:order="2"

@@ -23,14 +24,6 @@

         android:key="sign_in"

         android:order="3"

         android:title="@string/sign_in_to_chrome"/>

-    <org.chromium.components.browser_ui.settings.ChromeBasePreference

-        android:key="sync_and_services"

-        android:order="4"

-        android:layout="@layout/account_management_account_row"

-        android:title="@string/prefs_sync_and_services"

-        android:fragment="org.chromium.chrome.browser.sync.settings.SyncAndServicesSettings"/>

-    <!-- manage_sync and google_services replace sync_and_services if MOBILE_IDENTITY_CONSISTENCY

-         is enabled. -->

     <org.chromium.components.browser_ui.settings.ChromeBasePreference

         android:key="manage_sync"

         android:order="5"

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

@@ -32,8 +32,4 @@

         android:key="privacy_sandbox"

         android:title="@string/prefs_privacy_sandbox"

         android:fragment="org.chromium.chrome.browser.privacy_sandbox.PrivacySandboxSettingsFragment"/>

-    <org.chromium.components.browser_ui.settings.TextMessagePreference

-        android:key="sync_and_services_link"

-        android:summary="@string/privacy_sync_and_services_link_legacy"

-        app:allowDividerBelow="false"/>

 </PreferenceScreen>

-- 

2.17.1