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

Release 91.0.4472.143

Browse source
This commit is contained in:
csagan5 2021-06-25 11:04:55 +02:00 • committed by Harsh Barsaiyan
parent 07f90c0afc
commit ef760c798f
11 changed files with 219 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGELOG.md
View file

@ -1,3 +1,8 @@
# 91.0.4472.143
* add support for ISupportHelpAndFeedback
* JIT-less toggle (fixes https://github.com/bromite/bromite/issues/1235)
* enable crash reporting UI (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/944)
# 91.0.4472.102
* fix opening new tabs from links in always-incognito mode (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1154)
* allow saving pages in incognito mode (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1182)

2
build/RELEASE
View file

@ -1 +1 @@
91.0.4472.102
91.0.4472.143

2
build/bromite_patches_list.txt
View file

@ -152,5 +152,7 @@ Add-flag-for-omnibox-autocomplete-filtering.patch
Enable-IntentBlockExternalFormRedirectsNoGesture-by-default.patch
Add-flag-to-disable-external-intent-requests.patch
Logcat-crash-reports-UI.patch
Add-support-for-ISupportHelpAndFeedback.patch
JIT-less-toggle.patch
Automated-domain-substitution.patch
add-user-scripts.v5.patch

4
build/patches/Add-bookmark-import-export-actions.patch
View file

@ -1396,14 +1396,14 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
/**
* Whether Chrome is set as the default browser.
@@ -973,6 +975,7 @@ public final class ChromePreferenceKeys {
@@ -976,6 +978,7 @@ public final class ChromePreferenceKeys {
AUTOFILL_ASSISTANT_PROACTIVE_HELP,
APP_LAUNCH_LAST_KNOWN_ACTIVE_TAB_STATE,
APP_LAUNCH_SEARCH_ENGINE_HAD_LOGO,
+ BOOKMARKS_LAST_EXPORT_URI,
APPLICATION_OVERRIDE_LANGUAGE,
CHROME_SURVEY_DOWNLOAD_ATTEMPTS.pattern(),
CHROME_SURVEY_PROMPT_DISPLAYED_TIMESTAMP.pattern(),
CLIPBOARD_SHARED_URI,
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

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

@ -78,7 +78,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/Too
diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
--- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
+++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
@@ -490,6 +490,7 @@ public final class ChromePreferenceKeys {
@@ -493,6 +493,7 @@ public final class ChromePreferenceKeys {
public static final String FONT_USER_SET_FORCE_ENABLE_ZOOM = "user_set_force_enable_zoom";
public static final String HISTORY_SHOW_HISTORY_INFO = "history_home_show_info";

44
build/patches/Add-support-for-ISupportHelpAndFeedback.patch Normal file
View file

@ -0,0 +1,44 @@
From: uazo <uazo@users.noreply.github.com>
Date: Mon, 17 May 2021 12:30:12 +0000
Subject: Add support for ISupportHelpAndFeedback
---
.../chrome/browser/settings/SettingsActivity.java | 10 +++++++---
.../components/browser_ui/settings/SettingsUtils.java | 4 ++++
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
@@ -281,9 +281,13 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
finish();
return true;
} else if (item.getItemId() == R.id.menu_id_general_help) {
- HelpAndFeedbackLauncherImpl.getInstance().show(this,
- getString(R.string.help_context_settings), Profile.getLastUsedRegularProfile(),
- null);
+ if (mainFragment instanceof SettingsUtils.ISupportHelpAndFeedback) {
+ ((SettingsUtils.ISupportHelpAndFeedback)mainFragment).onHelpAndFeebackPressed();
+ } else {
+ HelpAndFeedbackLauncherImpl.getInstance().show(this,
+ getString(R.string.help_context_settings), Profile.getLastUsedRegularProfile(),
+ null);
+ }
return true;
}
return super.onOptionsItemSelected(item);
diff --git a/components/browser_ui/settings/android/java/src/org/chromium/components/browser_ui/settings/SettingsUtils.java b/components/browser_ui/settings/android/java/src/org/chromium/components/browser_ui/settings/SettingsUtils.java
--- a/components/browser_ui/settings/android/java/src/org/chromium/components/browser_ui/settings/SettingsUtils.java
+++ b/components/browser_ui/settings/android/java/src/org/chromium/components/browser_ui/settings/SettingsUtils.java
@@ -126,4 +126,8 @@ public class SettingsUtils {
ImageView imageButton = (ImageView) button;
return imageButton.getDrawable() == parentMenu.getOverflowIcon();
}
+
+ public interface ISupportHelpAndFeedback {
+ void onHelpAndFeebackPressed();
+ }
}
--
2.17.1

28
build/patches/Automated-domain-substitution.patch
View file

@ -7714,7 +7714,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
</message>
<message name="IDS_SETTINGS_SECURE_DNS_DISABLED_FOR_MANAGED_ENVIRONMENT" desc="Substring of the secure DNS setting when secure DNS is disabled due to detection of a managed environment">
This setting is disabled on managed browsers
@@ -922,7 +922,7 @@ Privacy Sandbox is still in active development and is available in selected regi
@@ -929,7 +929,7 @@ Privacy Sandbox is still in active development and is available in selected regi
<message name="IDS_CLEAR_BROWSING_DATA_HISTORY_DIALOG_DATA_TEXT" desc="Text of the dialog that is shown after the deletion of browsing history items finished, indicating that the selected data has been removed, but there may be other forms of browsing history still present in user's Google account.">
The selected data has been removed from Chrome and your synced devices.
@ -7723,7 +7723,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
</message>
<message name="IDS_CLEAR_CACHE_TITLE" desc="Title for Clear Cache in Clear Browsing Data dialog">
Cached images and files
@@ -959,10 +959,10 @@ Your Google account may have other forms of browsing history like searches and a
@@ -966,10 +966,10 @@ Your Google account may have other forms of browsing history like searches and a
Record history even in incognito mode
</message>
<message name="IDS_CLEAR_BROWSING_HISTORY_SUMMARY_SIGNED_IN" desc="A text explaining other forms of activity for signed in users.">
@ -7736,7 +7736,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
</message>
<message name="IDS_CLEAR_SEARCH_HISTORY_LINK" desc="Text informing the user that they can clear search history and other data using MyActivity.">
To clear <ph name="BEGIN_LINK1">&lt;link1&gt;</ph>search<ph name="END_LINK1">&lt;/link1&gt;</ph> or other forms of history, visit <ph name="BEGIN_LINK2">&lt;link2&gt;</ph>My Google Activity<ph name="END_LINK2">&lt;/link2&gt;</ph>
@@ -1025,7 +1025,7 @@ Your Google account may have other forms of browsing history like searches and a
@@ -1032,7 +1032,7 @@ Your Google account may have other forms of browsing history like searches and a
Basic
</message>
<message name="IDS_ANDROID_HISTORY_OTHER_FORMS_OF_HISTORY" desc="The notification at the top of the history page indicating that deleting Chrome browsing history will not delete other forms of history stored at Google My Activity.">
@ -7745,7 +7745,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
</message>
<message name="IDS_ANDROID_HISTORY_BLOCKED_SITE" desc="The text displayed in the history page indicating that a visit to a web site was blocked due to an administrator policy.">
Blocked site
@@ -1435,7 +1435,7 @@ Your Google account may have other forms of browsing history like searches and a
@@ -1442,7 +1442,7 @@ Your Google account may have other forms of browsing history like searches and a
In Lite mode, Chrome loads pages faster and uses up to 60 percent less data. To optimize the pages that you visit, Chrome sends your web traffic to Google. <ph name="BEGIN_LINK">&lt;link&gt;</ph>Learn more<ph name="END_LINK">&lt;/link&gt;</ph>
</message>
<message name="IDS_DATA_REDUCTION_PROMO_LEARN_MORE_URL" desc="URL for Lite mode help center article" translateable="false">
@ -7754,7 +7754,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
</message>
<message name="IDS_DATA_REDUCTION_ENABLE_BUTTON_LITE_MODE" desc="Button the user presses if they want to enable Lite mode" >
Turn on Lite mode
@@ -1622,10 +1622,10 @@ Your Google account may have other forms of browsing history like searches and a
@@ -1629,10 +1629,10 @@ Your Google account may have other forms of browsing history like searches and a
Waiting for details of parents.
</message>
<message name="IDS_ACCOUNT_MANAGEMENT_ONE_PARENT_NAME" desc="String for name of single parent for child account.">
@ -7767,7 +7767,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
</message>
<message name="IDS_ACCOUNT_MANAGEMENT_CHILD_CONTENT_TITLE" desc="Title of the Content setting, which controls which websites a child is allowed to visit.">
Content
@@ -1684,22 +1684,22 @@ Your Google account may have other forms of browsing history like searches and a
@@ -1691,22 +1691,22 @@ Your Google account may have other forms of browsing history like searches and a
Google Terms of Service
</message>
<message name="IDS_GOOGLE_TERMS_OF_SERVICE_URL" desc="URL for Google terms of service" translateable="false">
@ -7794,7 +7794,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
</message>
<!-- Sign-in strings -->
@@ -1716,7 +1716,7 @@ Your Google account may have other forms of browsing history like searches and a
@@ -1723,7 +1723,7 @@ Your Google account may have other forms of browsing history like searches and a
Also clear your Chrome data from this device
</message>
<message name="IDS_SIGNOUT_MANAGED_ACCOUNT_MESSAGE" desc="Message to display for sign out of Chrome dialog when the account has enterprise management, and all user data will be erased">
@ -7803,7 +7803,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
</message>
<message name="IDS_SIGN_IN_GETTING_ACCOUNT_MANAGEMENT_POLICY" desc="Title of progress bar dialog for getting management policy">
Contacting Google. This may take a minute…
@@ -1861,7 +1861,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
@@ -1868,7 +1868,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
<!-- Bluetooth Picker UI strings -->
<message name="IDS_BLUETOOTH_DIALOG_TITLE" desc="The header message shown on top of the dialog that lets the user pick a Bluetooth device for the site to pair with. Shown above a list of Bluetooth devices discovered. ">
@ -7812,7 +7812,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
<message name="IDS_BLUETOOTH_SEARCHING" desc="The message shown in the Bluetooth picker dialog while scanning for devices.">
<ph name="BEGIN_LINK">&lt;link&gt;</ph>Get help<ph name="END_LINK">&lt;/link&gt;</ph> while scanning for devices…
</message>
@@ -1906,7 +1906,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
@@ -1913,7 +1913,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
<!-- Bluetooth Scanning Prompt strings -->
<message name="IDS_BLUETOOTH_SCANNING_PROMPT_ORIGIN" desc="The label that is used to introduce Bluetooth scanning prompt details to the user when it is from a website.">
@ -7821,7 +7821,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
</message>
<message name="IDS_BLUETOOTH_SCANNING_DEVICE_UNKNOWN" desc="Text to identify Bluetooth devices of unknown or unsupported class.">
Unknown or unsupported device (<ph name="DEVICE_ID">%1$s<ex>A1:B2:C3:D4:E5:F6</ex></ph>)
@@ -3751,7 +3751,7 @@ Data from your Incognito session will only be cleared from Chrome when you <ph n
@@ -3758,7 +3758,7 @@ Data from your Incognito session will only be cleared from Chrome when you <ph n
<!-- WebUsb Picker UI strings -->
<message name="IDS_USB_CHOOSER_DIALOG_PROMPT" desc="The text that is used to introduce the USB chooser dialog to the user.">
@ -7830,7 +7830,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
</message>
<message name="IDS_USB_CHOOSER_DIALOG_NO_DEVICES_FOUND_PROMPT" desc="The label shown to the user to inform them that no USB devices were found matching the requirements that the application provided.">
No compatible devices found
@@ -3790,7 +3790,7 @@ Data from your Incognito session will only be cleared from Chrome when you <ph n
@@ -3797,7 +3797,7 @@ Data from your Incognito session will only be cleared from Chrome when you <ph n
Running in Chrome
</message>
<message name="IDS_TWA_RUNNING_IN_CHROME_V2" desc="Updated message on a snackbar indicating that the current Activity may use Chrome data (the rest of the app may not be).">
@ -7839,7 +7839,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
</message>
<message name="IDS_GOT_IT" desc="Button for the user to accept a disclosure/message">
Got it
@@ -4054,7 +4054,7 @@ Data from your Incognito session will only be cleared from Chrome when you <ph n
@@ -4061,7 +4061,7 @@ Data from your Incognito session will only be cleared from Chrome when you <ph n
Sending to <ph name="device_name">%1$s<ex>Tanya's Pixel 2</ex></ph>...
</message>
<message name="IDS_SEND_TAB_TO_SELF_NOTIFICATION_CONTEXT_TEXT" desc="Text displayed as the second line of a notification indicating the domain and the device the tab is shared from.">
@ -11708,7 +11708,7 @@ diff --git a/components/crash/core/app/crash_reporter_client.cc b/components/cra
diff --git a/components/crash/core/browser/resources/crashes.js b/components/crash/core/browser/resources/crashes.js
--- a/components/crash/core/browser/resources/crashes.js
+++ b/components/crash/core/browser/resources/crashes.js
@@ -105,7 +105,7 @@ function updateCrashList({
@@ -106,7 +106,7 @@ function updateCrashList({
const uploadIdValue = uploadId.querySelector('.value');
if (isGoogleAccount) {
const crashLink = document.createElement('a');
@ -11717,7 +11717,7 @@ diff --git a/components/crash/core/browser/resources/crashes.js b/components/cra
crashLink.target = '_blank';
crashLink.textContent = crash.id;
uploadIdValue.appendChild(crashLink);
@@ -180,7 +180,7 @@ function fileBug(crashId, os, version) {
@@ -175,7 +175,7 @@ function fileBug(crashId, os, version) {
// https://bugs.chromium.org/p/monorail/issues/detail?id=1488 is done.
labels: 'Restrict-View-EditIssue,Stability-Crash,User-Submitted',
};

122
build/patches/JIT-less-toggle.patch Normal file
View file

@ -0,0 +1,122 @@
From: hardenedfuchsiaoswhen <hardenedfuchsiaoswhen@protonmail.com>
Date: Fri, 18 Jun 2021 03:34:20 +0000
Subject: JIT-less toggle
---
chrome/android/java/res/xml/privacy_preferences.xml | 5 +++++
.../browser/privacy/settings/PrivacySettings.java | 12 ++++++++++++
.../ui/android/strings/android_chrome_strings.grd | 7 +++++++
.../browser/BrowserStartupControllerImpl.java | 1 +
.../chromium/content/browser/DeviceUtilsImpl.java | 6 ++++++
5 files changed, 31 insertions(+)
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
@@ -24,6 +24,11 @@
android:title="@string/preload_pages_title"
android:summary="@string/preload_pages_summary"
android:persistent="false"/>
+ <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
+ android:key="force_no_jit"
+ android:title="@string/force_no_jit_title"
+ android:summary="@string/force_no_jit_summary"
+ android:defaultValue="false" />
<org.chromium.components.browser_ui.settings.ChromeBasePreference
android:key="secure_dns"
android:title="@string/settings_secure_dns_title"
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
@@ -4,6 +4,7 @@
package org.chromium.chrome.browser.privacy.settings;
+import android.content.SharedPreferences;
import android.os.Build;
import android.content.SharedPreferences;
import android.os.Bundle;
@@ -65,6 +66,7 @@ public class PrivacySettings
private static final String PREF_CLOSE_TABS_ON_EXIT = "close_tabs_on_exit";
private static final String PREF_PROXY_OPTIONS = "proxy";
private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox";
+ private static final String PREF_FORCE_NO_JIT = "force_no_jit";
// moved from SyncAndServicesSettings.java
private static final String PREF_SERVICES_CATEGORY = "services_category";
@@ -165,6 +167,10 @@ public class PrivacySettings
.setBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
} else if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
prefService.setBoolean(Pref.SEARCH_SUGGEST_ENABLED, (boolean) newValue);
+ } else if (PREF_FORCE_NO_JIT.equals(key)) {
+ SharedPreferences.Editor sharedPreferenceEditor = ContextUtils.getAppSharedPreferences().edit();
+ sharedPreferenceEditor.putBoolean(PREF_FORCE_NO_JIT, (boolean) newValue);
+ sharedPreferenceEditor.apply();
} else if (PREF_AUTOFILL_ASSISTANT.equals(key)) {
mSharedPreferencesManager.writeBoolean(
ChromePreferenceKeys.AUTOFILL_ASSISTANT_ENABLED, (boolean) newValue);
@@ -245,6 +251,12 @@ public class PrivacySettings
historyInIncognitoPref.setChecked(
prefService.getBoolean(Pref.INCOGNITO_TAB_HISTORY_ENABLED));
}
+
+ ChromeSwitchPreference forceNoJit =
+ (ChromeSwitchPreference) findPreference(PREF_FORCE_NO_JIT);
+ forceNoJit.setOnPreferenceChangeListener(this);
+ forceNoJit.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
+
}
private ChromeManagedPreferenceDelegate createManagedPreferenceDelegate() {
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
@@ -910,6 +910,13 @@ Privacy Sandbox is still in active development and is available in selected regi
Please verify that this is a valid provider or try again later
</message>
+ <message name="IDS_FORCE_NO_JIT_TITLE" desc="Title for disable JIT settings. [CHAR-LIMIT=32]">
+ Disable JIT
+ </message>
+ <message name="IDS_FORCE_NO_JIT_SUMMARY" desc="Summary for Disable JIT settings">
+ Improve security at the expense of performance by not compiling JavaScript to native code (requires browser restart)
+ </message>
+
<message name="IDS_CLEAR_BROWSING_DATA_TITLE" desc="Title of the Clear Browsing Data screen. [CHAR-LIMIT=32]">
Clear browsing data
</message>
diff --git a/content/public/android/java/src/org/chromium/content/browser/BrowserStartupControllerImpl.java b/content/public/android/java/src/org/chromium/content/browser/BrowserStartupControllerImpl.java
--- a/content/public/android/java/src/org/chromium/content/browser/BrowserStartupControllerImpl.java
+++ b/content/public/android/java/src/org/chromium/content/browser/BrowserStartupControllerImpl.java
@@ -445,6 +445,7 @@ public class BrowserStartupControllerImpl implements BrowserStartupController {
}
// TODO(yfriedman): Remove dependency on a command line flag for this.
+ DeviceUtilsImpl.addJitlessSwitch();
DeviceUtilsImpl.addDeviceSpecificUserAgentSwitch();
BrowserStartupControllerImplJni.get().setCommandLineFlags(singleProcess);
}
diff --git a/content/public/android/java/src/org/chromium/content/browser/DeviceUtilsImpl.java b/content/public/android/java/src/org/chromium/content/browser/DeviceUtilsImpl.java
--- a/content/public/android/java/src/org/chromium/content/browser/DeviceUtilsImpl.java
+++ b/content/public/android/java/src/org/chromium/content/browser/DeviceUtilsImpl.java
@@ -5,6 +5,7 @@
package org.chromium.content.browser;
import org.chromium.base.CommandLine;
+import org.chromium.base.ContextUtils;
import org.chromium.base.StrictModeContext;
import org.chromium.content_public.common.ContentSwitches;
import org.chromium.ui.base.DeviceFormFactor;
@@ -22,4 +23,9 @@ public class DeviceUtilsImpl {
}
}
}
+ public static void addJitlessSwitch() {
+ if (ContextUtils.getAppSharedPreferences().getBoolean("force_no_jit", false)) {
+ CommandLine.getInstance().appendSwitchWithValue("js-flags", "--jitless");
+ }
+ }
}
--
2.17.1

46
build/patches/Logcat-crash-reports-UI.patch
View file

@ -8,7 +8,7 @@ Subject: Logcat crash reports UI
.../crash_upload_list_android.h | 1 +
chrome/browser/net/chrome_network_delegate.cc | 7 +
chrome/browser/ui/BUILD.gn | 1 +
chrome/browser/ui/webui/crashes_ui.cc | 170 ++++++++++++++++--
chrome/browser/ui/webui/crashes_ui.cc | 165 ++++++++++++++++--
.../crash/core/browser/crashes_ui_util.cc | 4 +
.../crash/core/browser/crashes_ui_util.h | 2 +
.../crash/core/browser/resources/crashes.css | 67 ++++++-
@ -21,7 +21,7 @@ Subject: Logcat crash reports UI
.../upload_list/text_log_upload_list.cc | 1 +
components/upload_list/upload_list.cc | 17 +-
components/upload_list/upload_list.h | 9 +
18 files changed, 379 insertions(+), 79 deletions(-)
18 files changed, 374 insertions(+), 79 deletions(-)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceImpl.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceImpl.java
@ -279,7 +279,7 @@ diff --git a/chrome/browser/ui/webui/crashes_ui.cc b/chrome/browser/ui/webui/cra
bool system_crash_reporter = false;
#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
@@ -241,12 +284,116 @@ void CrashesDOMHandler::HandleRequestSingleCrashUpload(
@@ -241,12 +284,111 @@ void CrashesDOMHandler::HandleRequestSingleCrashUpload(
bool success = args->GetString(0, &local_id);
DCHECK(success);
@ -309,42 +309,37 @@ diff --git a/chrome/browser/ui/webui/crashes_ui.cc b/chrome/browser/ui/webui/cra
+
+ // crash reports can have multiple extensions (e.g. foo.dmp, foo.dmp.try1,
+ // foo.skipped.try0), remove it
+ base::FilePath zip_file = crash_file_path;
+ while (zip_file != zip_file.RemoveExtension())
+ zip_file = zip_file.RemoveExtension();
+ base::FilePath zip_file_name = crash_file_path;
+ while (zip_file_name != zip_file_name.RemoveExtension())
+ zip_file_name = zip_file_name.RemoveExtension();
+
+ // make zip file name, like "ec708a7b-cb17-44e7-8dae-e32f6c45cb8c.zip"
+ zip_file = upload_log_path.Append(zip_file.BaseName())
+ zip_file_name = upload_log_path.Append(zip_file_name.BaseName())
+ .AddExtensionASCII(".zip");
+ // since the download is always allowed, the generation takes place only
+ // at the first request, so if exists return it
+ if (base::PathExists(zip_file))
+ return zip_file.value();
+ if (base::PathExists(zip_file_name))
+ return zip_file_name.value();
+
+ // original code remove the file immediately after upload.
+ // we changed this behavior but it is still possible that the file no longer exists
+ // because in uploads.log it could be indicated but the file was deleted by self-cleaning
+ if (!base::PathExists(crash_file_path)) {
+ LOG(ERROR) << "Crash report: file " << crash_file_path
+ << " no more avaiable";
+ << " no more available";
+ return std::string();
+ }
+
+ // temporary folder for zip, auto-removed when out of scope
+ base::ScopedTempDir temp_dir;
+ if (!temp_dir.CreateUniqueTempDir()) {
+ LOG(ERROR) << "Crash report: cannot create temp directory";
+ return std::string();
+ }
+ std::vector<base::FilePath> files_list;
+ files_list.push_back(crash_file_path.BaseName());
+
+ // temporary file for zip content
+ base::FilePath dest_file = temp_dir.GetPath().Append(crash_file_path.BaseName());
+
+ // make zip file
+ if (base::CopyFile(crash_file_path, dest_file)) {
+ if (zip::Zip(temp_dir.GetPath(), zip_file, false)) {
+ return zip_file.value();
+ }
+ // open zip file
+ base::File zip_f(zip_file_name,
+ base::File::FLAG_CREATE | base::File::FLAG_WRITE);
+ auto result = zip::ZipFiles(crash_file_path.DirName(), files_list, zip_f.GetPlatformFile());
+ zip_f.Close();
+ if (result) {
+ return zip_file_name.value();
+ }
+
+ LOG(ERROR) << "Crash report: cannot create zip content";
@ -401,7 +396,7 @@ diff --git a/chrome/browser/ui/webui/crashes_ui.cc b/chrome/browser/ui/webui/cra
}
} // namespace
@@ -258,7 +405,8 @@ void CrashesDOMHandler::HandleRequestSingleCrashUpload(
@@ -258,7 +400,8 @@ void CrashesDOMHandler::HandleRequestSingleCrashUpload(
///////////////////////////////////////////////////////////////////////////////
CrashesUI::CrashesUI(content::WebUI* web_ui) : WebUIController(web_ui) {
@ -869,3 +864,4 @@ diff --git a/components/upload_list/upload_list.h b/components/upload_list/uploa
--
2.17.1

4
build/patches/User-agent-customization.patch
View file

@ -866,7 +866,7 @@ diff --git a/chrome/browser/android/preferences/privacy_preferences_manager_impl
diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
--- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
+++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
@@ -957,6 +957,9 @@ public final class ChromePreferenceKeys {
@@ -960,6 +960,9 @@ public final class ChromePreferenceKeys {
public static final KeyPrefix KEY_ZERO_SUGGEST_HEADER_GROUP_COLLAPSED_BY_DEFAULT_PREFIX =
new KeyPrefix("zero_suggest_header_group_collapsed_by_default*");
@ -876,7 +876,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
/**
* These values are currently used as SharedPreferences keys, along with the keys in
* {@link LegacyChromePreferenceKeys#getKeysInUse()}. Add new SharedPreferences keys
@@ -1045,7 +1048,9 @@ public final class ChromePreferenceKeys {
@@ -1049,7 +1052,9 @@ public final class ChromePreferenceKeys {
SETTINGS_SAFETY_CHECK_RUN_COUNTER,
SIGNIN_PROMO_IMPRESSIONS_COUNT_NTP,
TWA_DISCLOSURE_SEEN_PACKAGES,

10
build/patches/build-remove-calling-untrusted-hooks.patch
View file

@ -11,7 +11,7 @@ sysroot.
diff --git a/DEPS b/DEPS
--- a/DEPS
+++ b/DEPS
@@ -99,7 +99,7 @@ vars = {
@@ -100,7 +100,7 @@ vars = {
# Check out and download nacl by default, unless on an arm mac.
# This can be disabled e.g. with custom_vars.
@ -20,7 +20,7 @@ diff --git a/DEPS b/DEPS
# By default, do not check out src-internal. This can be overridden e.g. with
# custom_vars.
@@ -130,8 +130,8 @@ vars = {
@@ -131,8 +131,8 @@ vars = {
# support for other platforms may be added in the future.
'checkout_openxr' : 'checkout_win',
@ -31,7 +31,7 @@ diff --git a/DEPS b/DEPS
# By default bot checkouts the WPR archive files only when this
# flag is set True.
@@ -3636,49 +3636,6 @@ hooks = [
@@ -3644,49 +3644,6 @@ hooks = [
'sync', '--extract',
],
},
@ -81,7 +81,7 @@ diff --git a/DEPS b/DEPS
{
# Case-insensitivity for the Win SDK. Must run before win_toolchain below.
'name': 'ciopfs_linux',
@@ -3821,18 +3778,6 @@ hooks = [
@@ -3829,18 +3786,6 @@ hooks = [
'-s', 'src/buildtools/mac/clang-format.sha1',
],
},
@ -100,7 +100,7 @@ diff --git a/DEPS b/DEPS
# Pull rc binaries using checked-in hashes.
{
'name': 'rc_win',
@@ -3858,29 +3803,6 @@ hooks = [
@@ -3866,29 +3811,6 @@ hooks = [
'-s', 'src/build/toolchain/win/rc/mac/rc.sha1',
],
},