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

Unverified Commit d15b126d authored by Carmelo Messina's avatar Carmelo Messina
Browse files

Patches for 140 (no changes)

parent bd40fa13

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

+5 −5
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java 
   "java/src/com/google/android/apps/chrome/appwidget/bookmarks/BookmarkThumbnailWidgetProvider.java",

   "java/src/org/chromium/chrome/browser/ActivityTabProvider.java",

   "java/src/org/chromium/chrome/browser/ActivityUtils.java",

@@ -907,6 +908,7 @@ chrome_java_sources = [

@@ -908,6 +909,7 @@ chrome_java_sources = [

   "java/src/org/chromium/chrome/browser/privacy/settings/IncognitoLockSettings.java",

   "java/src/org/chromium/chrome/browser/privacy/settings/PrivacyPreferencesManagerImpl.java",

   "java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java",
@@ -876,7 +876,7 @@ new file mode 100644 
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/FragmentDependencyProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/FragmentDependencyProvider.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/FragmentDependencyProvider.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/FragmentDependencyProvider.java

@@ -47,6 +47,7 @@ import org.chromium.chrome.browser.sync.settings.AccountManagementFragment;

@@ -49,6 +49,7 @@ import org.chromium.chrome.browser.sync.settings.AccountManagementFragment;

 import org.chromium.chrome.browser.sync.settings.GoogleServicesSettings;

 import org.chromium.chrome.browser.sync.settings.ManageSyncSettings;

 import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
@@ -884,7 +884,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Fragme 
 import org.chromium.components.browser_ui.accessibility.AccessibilitySettings;

 import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;

 import org.chromium.components.browser_ui.settings.FragmentSettingsNavigation;

@@ -226,6 +227,9 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl

@@ -231,6 +232,9 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl

                             SigninAndHistorySyncActivityLauncherImpl.get(),

                             new SettingsCustomTabLauncherImpl()));

         }
@@ -1310,7 +1310,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse 
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"

 #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h"

 #include "chrome/browser/commerce/shopping_service_factory.h"

@@ -264,6 +265,12 @@ ScopedJavaLocalRef<jobject> JNI_BookmarkBridge_NativeGetForProfile(

@@ -214,6 +215,12 @@ ScopedJavaLocalRef<jobject> JNI_BookmarkBridge_NativeGetForProfile(

   if (!profile)

     return nullptr;
@@ -1941,7 +1941,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow 
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd

--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd

+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd

@@ -6554,6 +6554,31 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d

@@ -6675,6 +6675,31 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d

       <message name="IDS_QUICK_DELETE_DIALOG_COOKIES_CACHE_AND_OTHER_SITE_DATA_TEXT" desc="Text indicating that browsing data like cookies, cache, and other site data would be deleted.">

         Cookies, cache, and other site data

       </message>

build/patches/Add-cromite-test-support.patch

+1 −1
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ diff --git a/chrome/browser/ui/startup/bad_flags_prompt.cc b/chrome/browser/ui/s 
diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn

--- a/chrome/common/BUILD.gn

+++ b/chrome/common/BUILD.gn

@@ -660,6 +660,7 @@ mojom("mojo_bindings") {

@@ -657,6 +657,7 @@ mojom("mojo_bindings") {

   sources = [

     "chrome_render_frame.mojom",

     "google_accounts_private_api_extension.mojom",

build/patches/Add-exit-menu-item.patch

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab 
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd

--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd

+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd

@@ -4226,6 +4226,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d

@@ -4347,6 +4347,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d

       <message name="IDS_MENU_AUTO_DARK_WEB_CONTENTS" desc="Menu item in Chrome's overflow/options menu. When Chrome's browser UI is set to dark theme and this option is checked, sites will have a dark theme automatically applied as well. [CHAR_LIMIT=24]">

         Dark theme

       </message>

build/patches/Add-menu-item-to-bookmark-all-tabs.patch

+5 −5
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab 
diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browser/bookmarks/android/bookmark_bridge.cc

--- a/chrome/browser/bookmarks/android/bookmark_bridge.cc

+++ b/chrome/browser/bookmarks/android/bookmark_bridge.cc

@@ -390,6 +390,33 @@ jboolean BookmarkBridge::AreAccountBookmarkFoldersActive(JNIEnv* env) {

@@ -340,6 +340,33 @@ jboolean BookmarkBridge::AreAccountBookmarkFoldersActive(JNIEnv* env) {

   return bookmark_model_->account_mobile_node() != nullptr;

 }
@@ -193,7 +193,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse 
 base::android::ScopedJavaLocalRef<jobject>

 BookmarkBridge::GetMostRecentlyAddedUserBookmarkIdForUrl(JNIEnv* env,

                                                          const GURL& url) {

@@ -502,6 +529,7 @@ void BookmarkBridge::GetAllFoldersWithDepths(

@@ -452,6 +479,7 @@ void BookmarkBridge::GetAllFoldersWithDepths(

   // Vector to temporarily contain all child bookmarks at same level for sorting

   std::vector<const BookmarkNode*> bookmarks = {

       bookmark_model_->mobile_node(),
@@ -201,7 +201,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse 
       bookmark_model_->bookmark_bar_node(),

       bookmark_model_->other_node(),

   };

@@ -610,6 +638,9 @@ std::vector<const BookmarkNode*> BookmarkBridge::GetTopLevelFolderIdsImpl(

@@ -560,6 +588,9 @@ std::vector<const BookmarkNode*> BookmarkBridge::GetTopLevelFolderIdsImpl(

     top_level_folders.push_back(other_node);

   }
@@ -211,7 +211,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse 
   const BookmarkNode* reading_list_node =

       local_or_syncable_reading_list_manager_->GetRoot();

   if (IsPermanentFolderVisible(

@@ -1306,6 +1337,17 @@ void BookmarkBridge::GetBookmarksOfType(

@@ -1237,6 +1268,17 @@ void BookmarkBridge::GetBookmarksOfType(

   AddBookmarkNodesToBookmarkIdList(env, j_list, results);

 }
@@ -459,7 +459,7 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse 
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd

--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd

+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd

@@ -4355,6 +4355,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d

@@ -4482,6 +4482,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d

       <message name="IDS_MENU_SELECT_TABS" desc="Menu item for bulk editing tabs. [CHAR_LIMIT=27]">

         Select tabs

       </message>

build/patches/Add-option-to-force-tablet-UI.patch

+2 −2
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ diff --git a/chrome/android/java/res/values-sw600dp/dimens.xml b/chrome/android/ 
diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res/values/dimens.xml

--- a/chrome/android/java/res/values/dimens.xml

+++ b/chrome/android/java/res/values/dimens.xml

@@ -113,9 +113,13 @@ found in the LICENSE file.

@@ -119,9 +119,13 @@ found in the LICENSE file.

     <dimen name="tab_modal_scrim_vertical_margin">16dp</dimen>

 

     <!-- Should match toolbar_height_no_shadow -->
@@ -401,7 +401,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow 
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd

--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd

+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd

@@ -1410,6 +1410,13 @@ Your Google account may have other forms of browsing history like searches and a

@@ -1531,6 +1531,13 @@ Your Google account may have other forms of browsing history like searches and a

         Privacy guide explanation closed

       </message>