diff --git a/CHANGELOG.md b/CHANGELOG.md index a6f5cb2e..873c3a52 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# 84.0.4147.132 +* fix exit menu item not always working (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/673) +* session-only cookies site settings option (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/142) +* add setting to enable history on incognito mode (thanks to @uazo) +* removed old non-working site settings patches + # 84.0.4147.121 * removed Qwant search engine * fixed zh_CN translations diff --git a/build/RELEASE b/build/RELEASE index 93d06b75..38c8a452 100644 --- a/build/RELEASE +++ b/build/RELEASE @@ -1 +1 @@ -84.0.4147.121 +84.0.4147.132 diff --git a/build/bromite_patches_list.txt b/build/bromite_patches_list.txt index be4a6b4a..758092a7 100644 --- a/build/bromite_patches_list.txt +++ b/build/bromite_patches_list.txt @@ -6,7 +6,6 @@ Always-allow-partner-customisation.patch battery_status_service-disable-more-privacy-nightmares.patch Battery-API-return-nothing.patch updater-disable-updater-pings.patch -prefs-only-keep-cookies-until-exit.patch Remove-EV-certificates.patch promo-disable-Google-promotion-fetching.patch Disable-omission-of-URL-elements-in-Omnibox.patch @@ -57,7 +56,6 @@ Add-flags-to-disable-device-motion-orientation-APIs.patch Disable-metrics-on-all-I-O-threads.patch Always-respect-async-dns-flag-regardless-of-SDK-version.patch Add-flag-to-configure-maximum-connections-per-host.patch -Add-site-settings-option-for-session-only-cookies.patch Add-bookmark-import-export-actions.patch Disable-promos-displayed-in-bookmarks-manager.patch Add-an-always-incognito-mode.patch diff --git a/build/patches/Add-a-flag-to-allow-screenshots-in-Incognito-mode.patch b/build/patches/Add-a-flag-to-allow-screenshots-in-Incognito-mode.patch index c5cb3dcd..84b05817 100644 --- a/build/patches/Add-a-flag-to-allow-screenshots-in-Incognito-mode.patch +++ b/build/patches/Add-a-flag-to-allow-screenshots-in-Incognito-mode.patch @@ -17,7 +17,7 @@ See also: diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -4437,6 +4437,12 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4441,6 +4441,12 @@ const FeatureEntry kFeatureEntries[] = { kOsAll, FEATURE_VALUE_TYPE(features::kEnableAmbientAuthenticationInIncognito)}, diff --git a/build/patches/Add-an-always-incognito-mode.patch b/build/patches/Add-an-always-incognito-mode.patch index caca5abf..76355646 100644 --- a/build/patches/Add-an-always-incognito-mode.patch +++ b/build/patches/Add-an-always-incognito-mode.patch @@ -152,7 +152,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -49,6 +49,7 @@ import org.chromium.base.supplier.ObservableSupplierImpl; +@@ -51,6 +51,7 @@ import org.chromium.base.supplier.OneShotCallback; import org.chromium.base.supplier.Supplier; import org.chromium.base.task.PostTask; import org.chromium.chrome.R; @@ -160,7 +160,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct import org.chromium.chrome.browser.IntentHandler.IntentHandlerDelegate; import org.chromium.chrome.browser.IntentHandler.TabOpenType; import org.chromium.chrome.browser.accessibility_tab_switcher.OverviewListLayout; -@@ -1621,8 +1622,9 @@ public class ChromeTabbedActivity +@@ -1644,8 +1645,9 @@ public class ChromeTabbedActivity Bundle savedInstanceState = getSavedInstanceState(); // We determine the model as soon as possible so every systems get initialized coherently. @@ -370,7 +370,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPer 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 -@@ -338,7 +338,7 @@ const base::Feature kCCTExternalLinkHandling{"CCTExternalLinkHandling", +@@ -339,7 +339,7 @@ const base::Feature kCCTExternalLinkHandling{"CCTExternalLinkHandling", base::FEATURE_ENABLED_BY_DEFAULT}; const base::Feature kCCTIncognito{"CCTIncognito", @@ -382,7 +382,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/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 -@@ -725,6 +725,13 @@ Your Google account may have other forms of browsing history like searches and a +@@ -724,6 +724,13 @@ Your Google account may have other forms of browsing history like searches and a Clears history and autocompletions in the address bar. diff --git a/build/patches/Add-custom-tab-intents-privacy-option.patch b/build/patches/Add-custom-tab-intents-privacy-option.patch index ce4cd277..fceb8572 100644 --- a/build/patches/Add-custom-tab-intents-privacy-option.patch +++ b/build/patches/Add-custom-tab-intents-privacy-option.patch @@ -97,7 +97,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting 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 -@@ -3450,6 +3450,13 @@ Only you can see what your camera is looking at. The site can't see your camera' +@@ -3449,6 +3449,13 @@ Only you can see what your camera is looking at. The site can't see your camera' Show original diff --git a/build/patches/Add-exit-menu-item.patch b/build/patches/Add-exit-menu-item.patch index 87b3b152..694a6061 100644 --- a/build/patches/Add-exit-menu-item.patch +++ b/build/patches/Add-exit-menu-item.patch @@ -4,11 +4,11 @@ Subject: Add exit menu item Corrected Exit functionality --- - chrome/android/java/res/menu/main_menu.xml | 4 ++++ - .../src/org/chromium/chrome/browser/ChromeActivity.java | 5 +++++ - .../chrome/browser/init/ChromeLifetimeController.java | 6 +++++- - .../browser/ui/android/strings/android_chrome_strings.grd | 3 +++ - 4 files changed, 17 insertions(+), 1 deletion(-) + chrome/android/java/res/menu/main_menu.xml | 4 ++++ + .../src/org/chromium/chrome/browser/ChromeActivity.java | 7 +++++++ + .../chrome/browser/init/ChromeLifetimeController.java | 6 +++++- + .../browser/ui/android/strings/android_chrome_strings.grd | 3 +++ + 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml --- a/chrome/android/java/res/menu/main_menu.xml @@ -34,8 +34,8 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java -@@ -1925,6 +1925,11 @@ public abstract class ChromeActivity - return true; +@@ -1920,6 +1920,11 @@ public abstract class ChromeActivity + RecordUserAction.record("MobileMenuSettings"); } + if (id == R.id.exit_id) { @@ -43,9 +43,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity. + return true; + } + - final Tab currentTab = getActivityTab(); - - if (id == R.id.help_id) { + if (id == R.id.update_menu_id) { + UpdateMenuItemHelper.getInstance().onMenuItemClicked(this); + return true; +@@ -1996,6 +2001,8 @@ public abstract class ChromeActivity + AddToHomescreenCoordinator.showForAppMenu( + this, getWindowAndroid(), getModalDialogManager(), currentTab.getWebContents()); + RecordUserAction.record("MobileMenuAddToHomescreen"); ++ } else if (id == R.id.exit_id) { ++ ApplicationLifetime.terminate(false); + } else if (id == R.id.open_webapk_id) { + Context context = ContextUtils.getApplicationContext(); + String packageName = diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLifetimeController.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLifetimeController.java --- a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLifetimeController.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLifetimeController.java @@ -65,7 +74,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLife 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 -@@ -2414,6 +2414,9 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

Settings @@ -75,3 +84,6 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Close all tabs +-- +2.17.1 + diff --git a/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch b/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch index dca206cd..aaba00ae 100644 --- a/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch +++ b/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch @@ -38,9 +38,9 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc + {"max-connections-per-host", flag_descriptions::kMaxConnectionsPerHostName, + flag_descriptions::kMaxConnectionsPerHostDescription, kOsAll, + MULTI_VALUE_TYPE(kMaxConnectionsPerHostChoices)}, - #endif // OS_ANDROID - {"disallow-doc-written-script-loads", - flag_descriptions::kDisallowDocWrittenScriptsUiName, + {"reengagement-notification", + flag_descriptions::kReengagementNotificationName, + flag_descriptions::kReengagementNotificationDescription, kOsAndroid, diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc diff --git a/build/patches/Add-flag-to-disable-IPv6-probes.patch b/build/patches/Add-flag-to-disable-IPv6-probes.patch index 5fd98792..f6335527 100644 --- a/build/patches/Add-flag-to-disable-IPv6-probes.patch +++ b/build/patches/Add-flag-to-disable-IPv6-probes.patch @@ -16,7 +16,7 @@ Subject: Add flag to disable IPv6 probes diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -3709,6 +3709,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3713,6 +3713,11 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kDirectManipulationStylus)}, #endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) diff --git a/build/patches/Add-history-support-in-incognito-mode.patch b/build/patches/Add-history-support-in-incognito-mode.patch index d20e346d..f0bc1584 100644 --- a/build/patches/Add-history-support-in-incognito-mode.patch +++ b/build/patches/Add-history-support-in-incognito-mode.patch @@ -212,7 +212,7 @@ old mode 100644 new mode 100755 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -746,6 +746,12 @@ Your Google account may have other forms of browsing history like searches and a +@@ -745,6 +745,12 @@ Your Google account may have other forms of browsing history like searches and a Opens links in incognito tabs when you click on new tab or on a link @@ -230,7 +230,7 @@ old mode 100644 new mode 100755 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_it.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_it.xtb -@@ -1011,4 +1011,6 @@ Ad esempio, alcuni siti web potrebbero rispondere alla richiesta mostrando annun +@@ -1017,4 +1017,6 @@ Ad esempio, alcuni siti web potrebbero rispondere alla richiesta mostrando annun Utilizza un servizio di previsione per visualizzare query correlate e siti web popolari durante la digitazione nella barra degli indirizzi Sincronizzazione con Gestione attività di Google diff --git a/build/patches/Add-menu-item-to-view-source.patch b/build/patches/Add-menu-item-to-view-source.patch index 9ab1fd98..cda21677 100644 --- a/build/patches/Add-menu-item-to-view-source.patch +++ b/build/patches/Add-menu-item-to-view-source.patch @@ -40,7 +40,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java -@@ -2005,6 +2005,8 @@ public abstract class ChromeActivity +@@ -2010,6 +2010,8 @@ public abstract class ChromeActivity } catch (ActivityNotFoundException e) { Toast.makeText(context, R.string.open_webapk_failed, Toast.LENGTH_SHORT).show(); } @@ -52,7 +52,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -1815,6 +1815,8 @@ public class ChromeTabbedActivity +@@ -1838,6 +1838,8 @@ public class ChromeTabbedActivity NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_DOWNLOADS_MANAGER); } RecordUserAction.record("MobileMenuDownloadManager"); @@ -106,7 +106,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust 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 -@@ -310,6 +310,9 @@ CHAR-LIMIT guidelines: +@@ -309,6 +309,9 @@ CHAR-LIMIT guidelines: Other Google services diff --git a/build/patches/Add-option-to-configure-the-ad-blocker-filters-URL.patch b/build/patches/Add-option-to-configure-the-ad-blocker-filters-URL.patch index b58b2834..2e32b483 100644 --- a/build/patches/Add-option-to-configure-the-ad-blocker-filters-URL.patch +++ b/build/patches/Add-option-to-configure-the-ad-blocker-filters-URL.patch @@ -49,7 +49,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -1319,6 +1319,8 @@ chrome_java_sources = [ +@@ -1321,6 +1321,8 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/photo_picker/DecodeVideoTask.java", "java/src/org/chromium/chrome/browser/photo_picker/DecoderService.java", "java/src/org/chromium/chrome/browser/photo_picker/DecoderServiceHost.java", @@ -449,7 +449,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows 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 -@@ -1826,6 +1826,20 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

diff --git a/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch b/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch index 319701f6..10c1b1c1 100644 --- a/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch +++ b/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch @@ -41,7 +41,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -1150,8 +1150,10 @@ public class ChromeTabbedActivity +@@ -1173,8 +1173,10 @@ public class ChromeTabbedActivity boolean hadCipherData = CipherFactory.getInstance().restoreFromBundle(getSavedInstanceState()); @@ -106,7 +106,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting 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 -@@ -3197,6 +3197,12 @@ Only you can see what your camera is looking at. The site can't see your camera' +@@ -3196,6 +3196,12 @@ Only you can see what your camera is looking at. The site can't see your camera' IMAGE diff --git a/build/patches/Add-site-settings-option-for-session-only-cookies.patch b/build/patches/Add-site-settings-option-for-session-only-cookies.patch deleted file mode 100644 index e61e5e10..00000000 --- a/build/patches/Add-site-settings-option-for-session-only-cookies.patch +++ /dev/null @@ -1,147 +0,0 @@ -From: csagan5 <32685696+csagan5@users.noreply.github.com> -Date: Tue, 28 Aug 2018 23:27:23 +0200 -Subject: Add site settings option for session-only cookies - ---- - .../java/res/xml/website_preferences.xml | 7 ++++ - .../site_settings/SingleCategorySettings.java | 37 ++++++++++++++++++- - .../strings/android/site_settings.grdp | 6 +++ - 3 files changed, 49 insertions(+), 1 deletion(-) - -diff --git a/components/browser_ui/site_settings/android/java/res/xml/website_preferences.xml b/components/browser_ui/site_settings/android/java/res/xml/website_preferences.xml ---- a/components/browser_ui/site_settings/android/java/res/xml/website_preferences.xml -+++ b/components/browser_ui/site_settings/android/java/res/xml/website_preferences.xml -@@ -40,6 +40,13 @@ - android:title="@string/website_settings_category_notifications_quiet" - android:defaultValue="false" - android:persistent="false" /> -+ -+ - - - Camera - -+ -+ Keep cookies only until you quit your browser -+ -+ -+ When enabled, all cookies will be erased when the browsing session is over -+ - - Clipboard - --- -2.17.1 - diff --git a/build/patches/Add-user-setting-for-DNS-over-HTTPS-DoH-custom-URL.patch b/build/patches/Add-user-setting-for-DNS-over-HTTPS-DoH-custom-URL.patch index f3797301..f775f014 100644 --- a/build/patches/Add-user-setting-for-DNS-over-HTTPS-DoH-custom-URL.patch +++ b/build/patches/Add-user-setting-for-DNS-over-HTTPS-DoH-custom-URL.patch @@ -45,7 +45,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -1371,6 +1371,8 @@ chrome_java_sources = [ +@@ -1374,6 +1374,8 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/searchwidget/SearchWidgetProvider.java", "java/src/org/chromium/chrome/browser/send_tab_to_self/DevicePickerBottomSheetAdapter.java", "java/src/org/chromium/chrome/browser/send_tab_to_self/DevicePickerBottomSheetContent.java", @@ -497,7 +497,7 @@ diff --git a/chrome/browser/net/stub_resolver_config_reader.cc b/chrome/browser/ 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 -@@ -581,6 +581,17 @@ CHAR-LIMIT guidelines: +@@ -580,6 +580,17 @@ CHAR-LIMIT guidelines: Chrome Passwords diff --git a/build/patches/Automated-domain-substitution.patch b/build/patches/Automated-domain-substitution.patch index e9918359..94487ffc 100644 --- a/build/patches/Automated-domain-substitution.patch +++ b/build/patches/Automated-domain-substitution.patch @@ -881,7 +881,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeStringCon diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -185,7 +185,7 @@ public class ChromeTabbedActivity +@@ -190,7 +190,7 @@ public class ChromeTabbedActivity extends ChromeActivity implements AccessibilityUtil.Observer { private static final String TAG = "ChromeTabbedActivity"; @@ -1060,7 +1060,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc #if !defined(OS_ANDROID) {"load-media-router-component-extension", flag_descriptions::kLoadMediaRouterComponentExtensionName, -@@ -3000,7 +3000,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3004,7 +3004,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSetMarketUrlForTestingName, flag_descriptions::kSetMarketUrlForTestingDescription, kOsAndroid, SINGLE_VALUE_TYPE_AND_VALUE(switches::kMarketUrlForTesting, @@ -9240,7 +9240,7 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc diff --git a/chrome/credential_provider/gaiacp/gaia_credential_base.cc b/chrome/credential_provider/gaiacp/gaia_credential_base.cc --- a/chrome/credential_provider/gaiacp/gaia_credential_base.cc +++ b/chrome/credential_provider/gaiacp/gaia_credential_base.cc -@@ -80,7 +80,7 @@ constexpr char kGetAccessTokenBodyWithScopeFormat[] = +@@ -82,7 +82,7 @@ constexpr char kGetAccessTokenBodyWithScopeFormat[] = constexpr wchar_t kRegCloudAssociation[] = L"enable_cloud_association"; // The access scopes should be separated by single space. constexpr char kAccessScopes[] = @@ -9249,7 +9249,7 @@ diff --git a/chrome/credential_provider/gaiacp/gaia_credential_base.cc b/chrome/ constexpr int kHttpTimeout = 3000; // in milliseconds // Names of keys used to fetch the custom attributes from google admin sdk -@@ -147,7 +147,7 @@ HRESULT GetExistingAccountMappingFromCD( +@@ -156,7 +156,7 @@ HRESULT GetExistingAccountMappingFromCD( std::string escape_url_encoded_email = net::EscapeUrlEncodedData(base::UTF16ToUTF8(email), true); std::string get_cd_user_url = base::StringPrintf( @@ -9258,7 +9258,7 @@ diff --git a/chrome/credential_provider/gaiacp/gaia_credential_base.cc b/chrome/ "%s?projection=full&viewType=domain_public", escape_url_encoded_email.c_str()); LOGFN(VERBOSE) << "Encoded URL : " << get_cd_user_url; -@@ -456,9 +456,9 @@ HRESULT MakeUsernameForAccount(const base::Value& result, +@@ -465,9 +465,9 @@ HRESULT MakeUsernameForAccount(const base::Value& result, // Determine if the email is a consumer domain (gmail.com or googlemail.com). base::string16 email = GetDictString(result, kKeyEmail); std::transform(email.begin(), email.end(), email.begin(), ::tolower); diff --git a/build/patches/Disable-safe-browsing.patch b/build/patches/Disable-safe-browsing.patch index aed86677..4d721a01 100644 --- a/build/patches/Disable-safe-browsing.patch +++ b/build/patches/Disable-safe-browsing.patch @@ -84,7 +84,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -1355,7 +1355,6 @@ chrome_java_sources = [ +@@ -1358,7 +1358,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/resources/ResourceMapper.java", "java/src/org/chromium/chrome/browser/rlz/RevenueStats.java", "java/src/org/chromium/chrome/browser/rlz/RlzPingHandler.java", @@ -1963,7 +1963,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn 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 -@@ -328,12 +328,6 @@ CHAR-LIMIT guidelines: +@@ -327,12 +327,6 @@ CHAR-LIMIT guidelines: Uses cookies to remember your preferences, even if you don't visit those pages @@ -1976,7 +1976,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Make searches and browsing better -@@ -343,12 +337,6 @@ CHAR-LIMIT guidelines: +@@ -342,12 +336,6 @@ CHAR-LIMIT guidelines: For more settings that relate to privacy, security, and data collection, see <link>Sync and Google services</link> @@ -1989,7 +1989,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Cancel sync? -@@ -672,30 +660,12 @@ CHAR-LIMIT guidelines: +@@ -671,30 +659,12 @@ CHAR-LIMIT guidelines: Privacy @@ -2020,7 +2020,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Touch to Search -@@ -3497,9 +3467,6 @@ Only you can see what your camera is looking at. The site can't see your camera' +@@ -3496,9 +3466,6 @@ Only you can see what your camera is looking at. The site can't see your camera' You can see sites you visit in Chrome and set timers for them.\n\nGoogle gets info about the sites you set timers for and how long you visit them. This info is used to make Digital Wellbeing better. diff --git a/build/patches/Disable-smart-selection-by-default.patch b/build/patches/Disable-smart-selection-by-default.patch index 750574d9..8f7540d9 100644 --- a/build/patches/Disable-smart-selection-by-default.patch +++ b/build/patches/Disable-smart-selection-by-default.patch @@ -15,7 +15,7 @@ leak information through the TextClassifier set by OEM, if any 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 -@@ -381,7 +381,7 @@ const base::Feature kChromeSharingHubV15{"ChromeSharingHubV15", +@@ -382,7 +382,7 @@ const base::Feature kChromeSharingHubV15{"ChromeSharingHubV15", base::FEATURE_DISABLED_BY_DEFAULT}; const base::Feature kChromeSmartSelection{"ChromeSmartSelection", diff --git a/build/patches/Do-not-compile-QR-code-sharing.patch b/build/patches/Do-not-compile-QR-code-sharing.patch index 1d7cceef..5d39128f 100644 --- a/build/patches/Do-not-compile-QR-code-sharing.patch +++ b/build/patches/Do-not-compile-QR-code-sharing.patch @@ -13,7 +13,7 @@ Subject: Do not compile QR code sharing diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml -@@ -749,22 +749,6 @@ by a child template that "extends" this file. +@@ -755,22 +755,6 @@ by a child template that "extends" this file. diff --git a/build/patches/Enable-legacy-TLS-interstitital-warning.patch b/build/patches/Enable-legacy-TLS-interstitital-warning.patch index 852892af..4dddc169 100644 --- a/build/patches/Enable-legacy-TLS-interstitital-warning.patch +++ b/build/patches/Enable-legacy-TLS-interstitital-warning.patch @@ -15,7 +15,7 @@ Expose show-legacy-tls-warnings flag on Android as well diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -5269,11 +5269,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5273,11 +5273,9 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kElasticOverscrollWin)}, #endif diff --git a/build/patches/Remove-dependency-on-auth-signin-dynamic-and-tasks.patch b/build/patches/Remove-dependency-on-auth-signin-dynamic-and-tasks.patch index d12d7a68..81ebdc35 100644 --- a/build/patches/Remove-dependency-on-auth-signin-dynamic-and-tasks.patch +++ b/build/patches/Remove-dependency-on-auth-signin-dynamic-and-tasks.patch @@ -104,7 +104,7 @@ diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/b diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml -@@ -766,15 +766,6 @@ by a child template that "extends" this file. +@@ -772,15 +772,6 @@ by a child template that "extends" this file. diff --git a/build/patches/Remove-dependency-on-com.google.android.gms.cast.patch b/build/patches/Remove-dependency-on-com.google.android.gms.cast.patch index ddb4ccaf..a82c313e 100644 --- a/build/patches/Remove-dependency-on-com.google.android.gms.cast.patch +++ b/build/patches/Remove-dependency-on-com.google.android.gms.cast.patch @@ -1455,7 +1455,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro +@@ -1932,15 +1932,6 @@ public abstract class ChromeActivity final Tab currentTab = getActivityTab(); diff --git a/build/patches/Remove-signin-and-data-saver-integrations.patch b/build/patches/Remove-signin-and-data-saver-integrations.patch index 70423e44..3e603a22 100644 --- a/build/patches/Remove-signin-and-data-saver-integrations.patch +++ b/build/patches/Remove-signin-and-data-saver-integrations.patch @@ -82,7 +82,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro {% block extra_uses_permissions %} {% endblock %} -@@ -890,16 +882,6 @@ by a child template that "extends" this file. +@@ -896,16 +888,6 @@ by a child template that "extends" this file. android:resource="@xml/file_paths" /> @@ -99,7 +99,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro -@@ -1007,16 +989,6 @@ by a child template that "extends" this file. +@@ -1013,16 +995,6 @@ by a child template that "extends" this file. @@ -678,7 +678,7 @@ diff --git a/chrome/browser/android/signin/signin_manager_android.cc b/chrome/br 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 -@@ -264,18 +264,9 @@ CHAR-LIMIT guidelines: +@@ -263,18 +263,9 @@ CHAR-LIMIT guidelines: @@ -697,7 +697,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Sync and personalize across devices -@@ -334,9 +325,6 @@ CHAR-LIMIT guidelines: +@@ -333,9 +324,6 @@ CHAR-LIMIT guidelines: Sends URLs of pages you visit to Google @@ -707,7 +707,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Cancel sync? -@@ -872,9 +860,6 @@ Your Google account may have other forms of browsing history like searches and a +@@ -871,9 +859,6 @@ Your Google account may have other forms of browsing history like searches and a When Lite mode is on, Chrome uses Google servers to make pages load faster. Lite mode rewrites very slow pages to load only essential content. Lite mode does not apply to Incognito tabs. diff --git a/build/patches/Restore-Search-Ready-Omnibox-flag.patch b/build/patches/Restore-Search-Ready-Omnibox-flag.patch index 88935f0d..072858e5 100644 --- a/build/patches/Restore-Search-Ready-Omnibox-flag.patch +++ b/build/patches/Restore-Search-Ready-Omnibox-flag.patch @@ -64,7 +64,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -2752,6 +2752,11 @@ const char kSafeBrowsingUseLocalBlacklistsV2Description[] = +@@ -2758,6 +2758,11 @@ const char kSafeBrowsingUseLocalBlacklistsV2Description[] = "process to check the Safe Browsing reputation of URLs without calling " "into GmsCore for every URL."; @@ -79,7 +79,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -1604,6 +1604,9 @@ extern const char kReportFeedUserActionsDescription[]; +@@ -1607,6 +1607,9 @@ extern const char kReportFeedUserActionsDescription[]; extern const char kSafeBrowsingUseLocalBlacklistsV2Name[]; extern const char kSafeBrowsingUseLocalBlacklistsV2Description[]; @@ -92,7 +92,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio 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 -@@ -182,6 +182,7 @@ const base::Feature* kFeaturesExposedToJava[] = { +@@ -183,6 +183,7 @@ const base::Feature* kFeaturesExposedToJava[] = { &kRelatedSearches, &kRevampedContextMenu, &kScrollToExpandPaymentHandler, @@ -100,7 +100,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &kSearchEnginePromoExistingDevice, &kSearchEnginePromoNewDevice, &kServiceManagerForBackgroundPrefetch, -@@ -551,6 +552,9 @@ const base::Feature kRevampedContextMenu{"RevampedContextMenu", +@@ -555,6 +556,9 @@ const base::Feature kRevampedContextMenu{"RevampedContextMenu", const base::Feature kScrollToExpandPaymentHandler{ "ScrollToExpandPaymentHandler", base::FEATURE_DISABLED_BY_DEFAULT}; @@ -113,7 +113,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h --- a/chrome/browser/flags/android/chrome_feature_list.h +++ b/chrome/browser/flags/android/chrome_feature_list.h -@@ -103,6 +103,7 @@ extern const base::Feature kRevampedContextMenu; +@@ -104,6 +104,7 @@ extern const base::Feature kRevampedContextMenu; extern const base::Feature kScrollToExpandPaymentHandler; extern const base::Feature kSearchEnginePromoExistingDevice; extern const base::Feature kSearchEnginePromoNewDevice; diff --git a/build/patches/Revert-Remove-pre-unified-consent-code.patch b/build/patches/Revert-Remove-pre-unified-consent-code.patch index bb17fe16..0b75d6d0 100644 --- a/build/patches/Revert-Remove-pre-unified-consent-code.patch +++ b/build/patches/Revert-Remove-pre-unified-consent-code.patch @@ -398,7 +398,7 @@ diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/sync/UkmTe 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 -@@ -672,6 +672,18 @@ CHAR-LIMIT guidelines: +@@ -671,6 +671,18 @@ CHAR-LIMIT guidelines: Privacy @@ -417,7 +417,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Help improve Chrome security -@@ -1099,6 +1111,9 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1098,6 +1110,9 @@ Your Google account may have other forms of browsing history like searches and a Signed in to Google as @@ -430,7 +430,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_am.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_am.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_am.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_am.xtb -@@ -994,4 +994,21 @@ +@@ -1000,4 +1000,21 @@ ከመስመር ውጪ ሁሉንም ትሮች ይዝጉ አጠቃላይ @@ -457,7 +457,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ar.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ar.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ar.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ar.xtb -@@ -994,4 +994,21 @@ +@@ -1000,4 +1000,21 @@ بلا اتصال إغلاق جميع علامات التبويب عام @@ -484,7 +484,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_bg.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_bg.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_bg.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_bg.xtb -@@ -994,4 +994,21 @@ +@@ -1000,4 +1000,21 @@ Офлайн Затваряне на всички раздели Общи @@ -511,7 +511,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_bn.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_bn.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_bn.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_bn.xtb -@@ -996,4 +996,21 @@ +@@ -1002,4 +1002,21 @@ অফলাইন সমস্ত ট্যাবগুলি বন্ধ করুন সাধারণ @@ -538,7 +538,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ca.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ca.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ca.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ca.xtb -@@ -994,4 +994,21 @@ Per exemple, és possible que alguns llocs web responguin a aquesta sol·licitud +@@ -1000,4 +1000,21 @@ Per exemple, és possible que alguns llocs web responguin a aquesta sol·licitud Sense connexió Tanca totes les pestanyes General @@ -565,7 +565,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_cs.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_cs.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_cs.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_cs.xtb -@@ -994,4 +994,21 @@ Některé weby mohou například na tento požadavek reagovat tak, že vám zobr +@@ -1000,4 +1000,21 @@ Některé weby mohou například na tento požadavek reagovat tak, že vám zobr Offline Zavřít všechny karty Všeobecné @@ -592,7 +592,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_da.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_da.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_da.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_da.xtb -@@ -994,4 +994,21 @@ Nogle websites kan f.eks. reagere på denne anmodning ved at vise dig annoncer, +@@ -1000,4 +1000,21 @@ Nogle websites kan f.eks. reagere på denne anmodning ved at vise dig annoncer, Offline Luk alle faner Generelt @@ -619,7 +619,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_de.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_de.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_de.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_de.xtb -@@ -994,4 +994,21 @@ Einige Websites schalten möglicherweise Werbeanzeigen, deren Auswahl nicht dara +@@ -1000,4 +1000,21 @@ Einige Websites schalten möglicherweise Werbeanzeigen, deren Auswahl nicht dara Offline Alle Tabs schließen Allgemein @@ -646,7 +646,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_el.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_el.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_el.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_el.xtb -@@ -994,4 +994,21 @@ +@@ -1000,4 +1000,21 @@ Εκτός σύνδεσης Κλείσιμο όλων των καρτελών Γενικά @@ -673,7 +673,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_en-GB.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_en-GB.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_en-GB.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_en-GB.xtb -@@ -994,4 +994,21 @@ For example, some websites may respond to this request by showing you ads that a +@@ -1000,4 +1000,21 @@ For example, some websites may respond to this request by showing you ads that a Offline Close all tabs General @@ -700,7 +700,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_es-419.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_es-419.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_es-419.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_es-419.xtb -@@ -994,4 +994,21 @@ Por ejemplo, algunos sitios web pueden responder a la solicitud mediante anuncio +@@ -1000,4 +1000,21 @@ Por ejemplo, algunos sitios web pueden responder a la solicitud mediante anuncio Sin conexión Cerrar todas las pestañas General @@ -727,7 +727,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_es.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_es.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_es.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_es.xtb -@@ -994,4 +994,21 @@ Por ejemplo, algunos sitios web pueden responder a la solicitud mostrándote anu +@@ -1000,4 +1000,21 @@ Por ejemplo, algunos sitios web pueden responder a la solicitud mostrándote anu Sin conexión Cerrar todas las pestañas General @@ -754,7 +754,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_et.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_et.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_et.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_et.xtb -@@ -994,4 +994,21 @@ Näiteks võivad mõned veebisaidid taotlusele reageerida nii, et näitavad teil +@@ -1000,4 +1000,21 @@ Näiteks võivad mõned veebisaidid taotlusele reageerida nii, et näitavad teil Võrguühenduseta Sule kõik vahelehed Üldine @@ -781,7 +781,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_fa.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_fa.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_fa.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_fa.xtb -@@ -994,4 +994,21 @@ +@@ -1000,4 +1000,21 @@ آفلاین بستن همه برگه‌ها موارد کلی @@ -808,7 +808,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_fi.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_fi.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_fi.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_fi.xtb -@@ -994,4 +994,21 @@ Jotkin verkkosivustot voivat vastata tähän pyyntöön esimerkiksi näyttämäl +@@ -1000,4 +1000,21 @@ Jotkin verkkosivustot voivat vastata tähän pyyntöön esimerkiksi näyttämäl Offline Sulje kaikki välilehdet Yleistä @@ -835,7 +835,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_fil.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_fil.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_fil.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_fil.xtb -@@ -994,4 +994,21 @@ Halimbawa, puwedeng tumugon ang ilang website sa kahilingang ito sa pamamagitan +@@ -1000,4 +1000,21 @@ Halimbawa, puwedeng tumugon ang ilang website sa kahilingang ito sa pamamagitan Offline Isara ang lahat ng tab Pangkalahatan @@ -862,7 +862,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_fr.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_fr.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_fr.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_fr.xtb -@@ -994,4 +994,21 @@ Par exemple, certains sites Web peuvent répondre à cette demande en diffusant +@@ -1000,4 +1000,21 @@ Par exemple, certains sites Web peuvent répondre à cette demande en diffusant Hors connexion Fermer tous les onglets Général @@ -889,7 +889,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_gu.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_gu.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_gu.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_gu.xtb -@@ -994,4 +994,21 @@ +@@ -1000,4 +1000,21 @@ ઑફલાઇન બધા ટેબ્સ બંધ કરો સામાન્ય @@ -916,7 +916,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_hi.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_hi.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_hi.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_hi.xtb -@@ -994,4 +994,21 @@ +@@ -1000,4 +1000,21 @@ ऑफ़लाइन सभी टैब बंद करें सामान्य @@ -943,7 +943,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_hr.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_hr.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_hr.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_hr.xtb -@@ -994,4 +994,21 @@ Na primjer, neke web-lokacije na taj zahtjev mogu odgovoriti tako da vam prikaž +@@ -1000,4 +1000,21 @@ Na primjer, neke web-lokacije na taj zahtjev mogu odgovoriti tako da vam prikaž Izvanmrežno Zatvori sve kartice Općenito @@ -970,7 +970,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_hu.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_hu.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_hu.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_hu.xtb -@@ -994,4 +994,21 @@ Egyes webhelyek például válaszolhatnak rá úgy, hogy olyan hirdetéseket jel +@@ -1000,4 +1000,21 @@ Egyes webhelyek például válaszolhatnak rá úgy, hogy olyan hirdetéseket jel Offline Az összes lap bezárása Általános @@ -997,7 +997,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_id.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_id.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_id.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_id.xtb -@@ -994,4 +994,21 @@ Misalnya, beberapa situs web mungkin menanggapi permintaan ini dengan menayangka +@@ -1000,4 +1000,21 @@ Misalnya, beberapa situs web mungkin menanggapi permintaan ini dengan menayangka Offline Tutup semua tab Umum @@ -1024,7 +1024,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin 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 -@@ -994,4 +994,21 @@ Ad esempio, alcuni siti web potrebbero rispondere alla richiesta mostrando annun +@@ -1000,4 +1000,21 @@ Ad esempio, alcuni siti web potrebbero rispondere alla richiesta mostrando annun Offline Chiudi tutte le schede Generali @@ -1051,9 +1051,9 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_iw.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_iw.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_iw.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_iw.xtb -@@ -994,4 +994,21 @@ +@@ -1000,4 +1000,21 @@ לא מקוון - סגור את כל הכרטיסיות + סגירת כל הכרטיסיות כללי - \ No newline at end of file @@ -1078,7 +1078,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ja.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ja.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ja.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ja.xtb -@@ -994,4 +994,21 @@ +@@ -1000,4 +1000,21 @@ オフライン すべてのタブを閉じる 全般 @@ -1105,7 +1105,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_kn.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_kn.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_kn.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_kn.xtb -@@ -994,4 +994,21 @@ +@@ -1000,4 +1000,21 @@ ಆಫ್‌ಲೈನ್ ಎಲ್ಲ ಟ್ಯಾಬ್‌ಗಳನ್ನು ಮುಚ್ಚಿ ಸಾಮಾನ್ಯ @@ -1132,7 +1132,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ko.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ko.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ko.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ko.xtb -@@ -994,4 +994,21 @@ +@@ -1000,4 +1000,21 @@ 오프라인 탭 모두 닫기 일반 @@ -1159,7 +1159,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_lt.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_lt.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_lt.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_lt.xtb -@@ -994,4 +994,21 @@ Pavyzdžiui, kai kurios svetainės gali atsakyti į šią užklausą rodydamos j +@@ -1000,4 +1000,21 @@ Pavyzdžiui, kai kurios svetainės gali atsakyti į šią užklausą rodydamos j Neprisijungus Uždar. visų skirtukų lapus Bendra @@ -1186,7 +1186,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_lv.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_lv.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_lv.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_lv.xtb -@@ -994,4 +994,21 @@ Piemēram, dažas vietnes, reaģējot uz šo pieprasījumu, var rādīt jums rek +@@ -1000,4 +1000,21 @@ Piemēram, dažas vietnes, reaģējot uz šo pieprasījumu, var rādīt jums rek Bezsaistē Aizvērt visas cilnes Vispārīgi @@ -1213,9 +1213,9 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ml.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ml.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ml.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ml.xtb -@@ -994,4 +994,21 @@ +@@ -1000,4 +1000,21 @@ ഓഫ്‌ലൈൻ - എല്ലാ ടാബുകളും അടയ്‌ക്കുക + ടാബെല്ലാം അടയ്‌ക്കൂ പൊതുവായ - \ No newline at end of file @@ -1240,7 +1240,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_mr.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_mr.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_mr.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_mr.xtb -@@ -994,4 +994,21 @@ +@@ -1000,4 +1000,21 @@ ऑफलाइन सर्व टॅब बंद करा सामान्य @@ -1267,7 +1267,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ms.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ms.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ms.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ms.xtb -@@ -994,4 +994,21 @@ Sebagai contoh, sesetengah tapak web mungkin memberi respons kepada permintaan i +@@ -1000,4 +1000,21 @@ Sebagai contoh, sesetengah tapak web mungkin memberi respons kepada permintaan i Luar talian Tutup semua tab Umum @@ -1294,7 +1294,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_nl.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_nl.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_nl.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_nl.xtb -@@ -994,4 +994,21 @@ Zo kunnen sommige websites op dit verzoek reageren door advertenties weer te gev +@@ -1000,4 +1000,21 @@ Zo kunnen sommige websites op dit verzoek reageren door advertenties weer te gev Offline Alle tabbladen sluiten Algemeen @@ -1321,7 +1321,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_no.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_no.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_no.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_no.xtb -@@ -994,4 +994,21 @@ Noen nettsteder kan for eksempel svare på denne forespørselen ved å vise deg +@@ -1000,4 +1000,21 @@ Noen nettsteder kan for eksempel svare på denne forespørselen ved å vise deg Uten nett Lukk alle faner Generelt @@ -1348,7 +1348,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_pl.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_pl.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_pl.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_pl.xtb -@@ -994,4 +994,21 @@ Na przykład niektóre strony mogą na nie zareagować, wyświetlając reklamy b +@@ -1000,4 +1000,21 @@ Na przykład niektóre strony mogą na nie zareagować, wyświetlając reklamy b Offline Zamknij wszystkie karty Ogólne @@ -1375,7 +1375,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_pt-BR.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_pt-BR.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_pt-BR.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_pt-BR.xtb -@@ -995,4 +995,21 @@ Por exemplo, alguns sites podem responder a esse pedido mostrando anúncios que +@@ -1001,4 +1001,21 @@ Por exemplo, alguns sites podem responder a esse pedido mostrando anúncios que Off-line Fechar todas as guias Geral @@ -1402,7 +1402,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_pt-PT.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_pt-PT.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_pt-PT.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_pt-PT.xtb -@@ -994,4 +994,21 @@ Por exemplo, alguns Sites podem responder a este pedido ao mostrar-lhe anúncios +@@ -1000,4 +1000,21 @@ Por exemplo, alguns Sites podem responder a este pedido ao mostrar-lhe anúncios Offline Fechar todos os separadores Geral @@ -1429,7 +1429,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ro.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ro.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ro.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ro.xtb -@@ -994,4 +994,21 @@ De exemplu, unele site-uri pot răspunde la această solicitare afișând anunț +@@ -1000,4 +1000,21 @@ De exemplu, unele site-uri pot răspunde la această solicitare afișând anunț Offline Închide toate filele General @@ -1456,7 +1456,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ru.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ru.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ru.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ru.xtb -@@ -994,4 +994,21 @@ +@@ -1000,4 +1000,21 @@ Офлайн Закрыть все вкладки Общие @@ -1483,7 +1483,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sk.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sk.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sk.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sk.xtb -@@ -994,4 +994,21 @@ Niektoré weby môžu napríklad na túto žiadosť reagovať tak, že vám zobr +@@ -1000,4 +1000,21 @@ Niektoré weby môžu napríklad na túto žiadosť reagovať tak, že vám zobr Offline Zavrieť všetky karty Všeobecné @@ -1510,7 +1510,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sl.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sl.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sl.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sl.xtb -@@ -994,4 +994,21 @@ Nekatera spletna mesta se lahko na primer na zahtevo odzovejo tako, da prikažej +@@ -1000,4 +1000,21 @@ Nekatera spletna mesta se lahko na primer na zahtevo odzovejo tako, da prikažej Brez povezave Zapri vse zavihke Splošno @@ -1537,7 +1537,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sr.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sr.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sr.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sr.xtb -@@ -994,4 +994,21 @@ Google налог можда има друге облике историје п +@@ -1000,4 +1000,21 @@ Google налог можда има друге облике историје п Офлајн Затвори све картице Опште @@ -1564,7 +1564,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sv.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sv.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sv.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sv.xtb -@@ -994,4 +994,21 @@ Vissa webbplatser kan till exempel svara på begäran genom att visa annonser so +@@ -1000,4 +1000,21 @@ Vissa webbplatser kan till exempel svara på begäran genom att visa annonser so Offline Stäng alla flikar Allmänt @@ -1591,7 +1591,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sw.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sw.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sw.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sw.xtb -@@ -994,4 +994,21 @@ Kwa mfano, baadhi ya tovuti zinaweza kujibu ombi hili kwa kukuonyesha matangazo +@@ -1000,4 +1000,21 @@ Kwa mfano, baadhi ya tovuti zinaweza kujibu ombi hili kwa kukuonyesha matangazo Nje ya mtandao Funga vichupo vyote Jumla @@ -1618,7 +1618,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ta.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ta.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ta.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ta.xtb -@@ -994,4 +994,21 @@ +@@ -1000,4 +1000,21 @@ ஆஃப்லைன் எல்லா தாவல்களையும் மூடு பொது @@ -1645,7 +1645,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_te.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_te.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_te.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_te.xtb -@@ -994,4 +994,21 @@ +@@ -1000,4 +1000,21 @@ ఆఫ్‌లైన్ అన్ని ట్యాబ్‌లను మూసివేయి సాధారణం @@ -1672,7 +1672,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_th.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_th.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_th.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_th.xtb -@@ -994,4 +994,21 @@ +@@ -1000,4 +1000,21 @@ ออฟไลน์ ปิดแท็บทั้งหมด ทั่วไป @@ -1699,7 +1699,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_tr.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_tr.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_tr.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_tr.xtb -@@ -994,4 +994,21 @@ Bu ayarı değiştirmek için senkronizasyonu sıfırlay +@@ -1000,4 +1000,21 @@ Bu ayarı değiştirmek için senkronizasyonu sıfırlay Çevrimdışı Tüm sekmeleri kapat Genel @@ -1726,7 +1726,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_uk.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_uk.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_uk.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_uk.xtb -@@ -994,4 +994,21 @@ +@@ -1000,4 +1000,21 @@ Офлайн Закрити всі вкладки Загальне @@ -1753,9 +1753,9 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_vi.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_vi.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_vi.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_vi.xtb -@@ -994,4 +994,21 @@ Ví dụ: một số trang web có thể phản hồi yêu cầu này bằng cá +@@ -1000,4 +1000,21 @@ Ví dụ: một số trang web có thể phản hồi yêu cầu này bằng cá Ngoại tuyến - Đóng tất cả các tab + Đóng tất cả các thẻ Chung - \ No newline at end of file @@ -1780,7 +1780,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb -@@ -994,4 +994,21 @@ +@@ -1000,4 +1000,21 @@ 离线 关闭所有标签页 常规 @@ -1807,7 +1807,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-TW.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-TW.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-TW.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-TW.xtb -@@ -994,4 +994,21 @@ +@@ -1000,4 +1000,21 @@ 離線 關閉所有分頁 一般 diff --git a/build/patches/Update-i18n-zh_CN-support.patch b/build/patches/Update-i18n-zh_CN-support.patch index ee413709..b63e8e32 100644 --- a/build/patches/Update-i18n-zh_CN-support.patch +++ b/build/patches/Update-i18n-zh_CN-support.patch @@ -24,7 +24,7 @@ diff --git a/chrome/app/resources/generated_resources_zh-CN.xtb b/chrome/app/res diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb -@@ -1011,4 +1011,23 @@ +@@ -1017,4 +1017,23 @@ 当您在地址栏中输入查询内容时,使用联想查询服务显示相关查询和热门网站 正在同步到 Google 活动控件 diff --git a/build/patches/kill-GCM.patch b/build/patches/kill-GCM.patch index 03a5767f..407c835a 100644 --- a/build/patches/kill-GCM.patch +++ b/build/patches/kill-GCM.patch @@ -69,7 +69,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java "java/src/org/chromium/chrome/browser/ChromeBackupAgent.java", "java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java", "java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java", -@@ -1384,11 +1383,6 @@ chrome_java_sources = [ +@@ -1387,11 +1386,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/services/AndroidChildAccountHelper.java", "java/src/org/chromium/chrome/browser/services/AndroidEduOwnerCheckCallback.java", "java/src/org/chromium/chrome/browser/services/GoogleServicesManager.java", @@ -107,7 +107,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro {% block extra_uses_permissions %} -@@ -949,45 +944,6 @@ by a child template that "extends" this file. +@@ -955,45 +950,6 @@ by a child template that "extends" this file. android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize" android:hardwareAccelerated="false" /> @@ -153,7 +153,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro -@@ -1009,28 +965,10 @@ by a child template that "extends" this file. +@@ -1015,28 +971,10 @@ by a child template that "extends" this file. android:exported="false" android:permission="android.permission.BIND_JOB_SERVICE"/> diff --git a/build/patches/prefs-only-keep-cookies-until-exit.patch b/build/patches/prefs-only-keep-cookies-until-exit.patch deleted file mode 100644 index f587e479..00000000 --- a/build/patches/prefs-only-keep-cookies-until-exit.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Jan Engelhardt -Date: Sat, 13 Sep 2014 17:25:47 +0200 -Subject: prefs: only keep cookies until exit - -Out with all those tracking cookies! ---- - .../content_settings/core/browser/content_settings_registry.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc ---- a/components/content_settings/core/browser/content_settings_registry.cc -+++ b/components/content_settings/core/browser/content_settings_registry.cc -@@ -140,7 +140,7 @@ void ContentSettingsRegistry::Init() { - // WARNING: The string names of the permissions passed in below are used to - // generate preference names and should never be changed! - -- Register(ContentSettingsType::COOKIES, "cookies", CONTENT_SETTING_ALLOW, -+ Register(ContentSettingsType::COOKIES, "cookies", CONTENT_SETTING_SESSION_ONLY, - WebsiteSettingsInfo::SYNCABLE, - WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme), - ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK, --- -2.17.1 - diff --git a/build/patches/ungoogled-chromium-Disable-translate-integration.patch b/build/patches/ungoogled-chromium-Disable-translate-integration.patch index c6110b17..4e3d34ba 100644 --- a/build/patches/ungoogled-chromium-Disable-translate-integration.patch +++ b/build/patches/ungoogled-chromium-Disable-translate-integration.patch @@ -69,7 +69,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/language/settin 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 -@@ -876,9 +876,6 @@ Your Google account may have other forms of browsing history like searches and a +@@ -875,9 +875,6 @@ Your Google account may have other forms of browsing history like searches and a Websites will show text in your preferred language, when possible.