Skip to content

Commit 4ddcbc4

Browse files
authored
Merge pull request #524 from teeminus/update
2 parents 6c03a3e + 0a7c271 commit 4ddcbc4

File tree

5 files changed

+7
-34
lines changed

5 files changed

+7
-34
lines changed

.github/actions/stage/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ async function run() {
5555
}
5656
try {
5757
await artifact.uploadArtifact(finalArtifactName, packageList,
58-
'C:\\ungoogled-chromium-windows\\build', {retentionDays: 3, compressionLevel: 0});
58+
'C:\\ungoogled-chromium-windows\\build', {retentionDays: 4, compressionLevel: 0});
5959
break;
6060
} catch (e) {
6161
console.error(`Upload artifact failed: ${e}`);
@@ -75,7 +75,7 @@ async function run() {
7575
}
7676
try {
7777
await artifact.uploadArtifact(artifactName, ['C:\\ungoogled-chromium-windows\\artifacts.zip'],
78-
'C:\\ungoogled-chromium-windows', {retentionDays: 1, compressionLevel: 0});
78+
'C:\\ungoogled-chromium-windows', {retentionDays: 4, compressionLevel: 0});
7979
break;
8080
} catch (e) {
8181
console.error(`Upload artifact failed: ${e}`);

domain_substitution.list

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2155,6 +2155,7 @@ chrome/browser/ui/webui/management/management_ui_handler_unittest.cc
21552155
chrome/browser/ui/webui/media_router/cast_feedback_ui.cc
21562156
chrome/browser/ui/webui/nearby_internals/quick_pair/quick_pair_handler.cc
21572157
chrome/browser/ui/webui/new_tab_footer/new_tab_footer_handler_browsertest.cc
2158+
chrome/browser/ui/webui/new_tab_page/action_chips/action_chips_generator_unittest.cc
21582159
chrome/browser/ui/webui/new_tab_page/action_chips/action_chips_handler_unittest.cc
21592160
chrome/browser/ui/webui/new_tab_page/foo/foo_handler.cc
21602161
chrome/browser/ui/webui/new_tab_page/new_tab_page_handler_unittest.cc
@@ -8256,6 +8257,7 @@ third_party/devtools-frontend/src/front_end/panels/timeline/TimelineTreeView.ts
82568257
third_party/devtools-frontend/src/front_end/panels/timeline/TimelineUIUtils.test.ts
82578258
third_party/devtools-frontend/src/front_end/panels/timeline/TimingsTrackAppender.ts
82588259
third_party/devtools-frontend/src/front_end/panels/timeline/components/DetailsView.ts
8260+
third_party/devtools-frontend/src/front_end/panels/timeline/components/ExportTraceOptions.ts
82598261
third_party/devtools-frontend/src/front_end/panels/timeline/components/FieldSettingsDialog.ts
82608262
third_party/devtools-frontend/src/front_end/panels/timeline/components/LiveMetricsView.ts
82618263
third_party/devtools-frontend/src/front_end/panels/timeline/components/SidebarInsightsTab.test.ts

patches/ungoogled-chromium/windows/windows-fix-building-without-safebrowsing.patch

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
"//build:branding_buildflags",
1818
--- a/chrome/browser/chrome_content_browser_client.cc
1919
+++ b/chrome/browser/chrome_content_browser_client.cc
20-
@@ -5111,7 +5111,6 @@ std::wstring ChromeContentBrowserClient:
20+
@@ -5129,7 +5129,6 @@ std::wstring ChromeContentBrowserClient:
2121
#endif
2222
case sandbox::mojom::Sandbox::kPrintCompositor:
2323
case sandbox::mojom::Sandbox::kAudio:
2424
- case sandbox::mojom::Sandbox::kScreenAI:
2525
case sandbox::mojom::Sandbox::kSpeechRecognition:
2626
case sandbox::mojom::Sandbox::kPdfConversion:
2727
case sandbox::mojom::Sandbox::kService:
28-
@@ -5207,7 +5206,6 @@ bool ChromeContentBrowserClient::PreSpaw
28+
@@ -5225,7 +5224,6 @@ bool ChromeContentBrowserClient::PreSpaw
2929
case sandbox::mojom::Sandbox::kPrintBackend:
3030
#endif
3131
case sandbox::mojom::Sandbox::kPrintCompositor:
@@ -64,25 +64,6 @@
6464
std::wstring cred_provider_gaia_id;
6565
std::wstring cred_provider_email;
6666

67-
--- a/chrome/browser/ui/safety_hub/abusive_notification_permissions_manager.cc
68-
+++ b/chrome/browser/ui/safety_hub/abusive_notification_permissions_manager.cc
69-
@@ -113,15 +113,7 @@ bool HasShowOriginalSuspiciousNotificati
70-
base::Value stored_value(hcsm->GetWebsiteSetting(
71-
url, url, ContentSettingsType::SUSPICIOUS_NOTIFICATION_SHOW_ORIGINAL));
72-
73-
- if (stored_value.is_none()) {
74-
- return false;
75-
- }
76-
- DCHECK(stored_value.is_dict());
77-
- DCHECK(stored_value.GetDict().contains(
78-
- safe_browsing::kSuspiciousNotificationShowOriginalKey));
79-
- return stored_value.GetDict()
80-
- .FindBool(safe_browsing::kSuspiciousNotificationShowOriginalKey)
81-
- .value_or(false);
82-
+ return false;
83-
}
84-
85-
// Return true if the url should be considered for suspicious content
8667
--- a/components/safe_browsing/buildflags.gni
8768
+++ b/components/safe_browsing/buildflags.gni
8869
@@ -20,6 +20,7 @@ declare_args() {

patches/ungoogled-chromium/windows/windows-fix-missing-includes.patch

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
--- a/components/contextual_tasks/internal/BUILD.gn
2-
+++ b/components/contextual_tasks/internal/BUILD.gn
3-
@@ -45,6 +45,7 @@ source_set("internal") {
4-
"//net",
5-
"//ui/gfx",
6-
"//url",
7-
+ "//third_party/re2",
8-
]
9-
}
10-
111
--- a/third_party/blink/renderer/core/xml/xslt_extensions.cc
122
+++ b/third_party/blink/renderer/core/xml/xslt_extensions.cc
133
@@ -30,6 +30,7 @@

ungoogled-chromium

0 commit comments

Comments
 (0)