-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
a23260f
commit f887f69
Showing
249 changed files
with
6,004 additions
and
726 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,3 +8,4 @@ gotit.json | |
.kdev4/ipfs-chromium.kdev4 | ||
*.autosave.* | ||
*.autosave | ||
compile_commands.json |
27 changes: 27 additions & 0 deletions
27
chromium_edits/128.0.6613.186/chrome/browser/BUILD.gn.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn | ||
index fe0452e8bd462..575137d6dbbf9 100644 | ||
--- a/chrome/browser/BUILD.gn | ||
+++ b/chrome/browser/BUILD.gn | ||
@@ -41,6 +41,7 @@ import("//sandbox/features.gni") | ||
import("//services/screen_ai/buildflags/features.gni") | ||
import("//testing/libfuzzer/fuzzer_test.gni") | ||
import("//third_party/blink/public/public_features.gni") | ||
+import("//third_party/ipfs_client/args.gni") | ||
import("//third_party/protobuf/proto_library.gni") | ||
import("//third_party/webrtc/webrtc.gni") | ||
import("//third_party/widevine/cdm/widevine.gni") | ||
@@ -2717,6 +2718,14 @@ static_library("browser") { | ||
] | ||
} | ||
|
||
+ if (enable_ipfs) { | ||
+ sources += [ | ||
+ "ipfs_extra_parts.cc", | ||
+ "ipfs_extra_parts.h", | ||
+ ] | ||
+ deps += [ "//components/ipfs" ] | ||
+ } | ||
+ | ||
if (is_chromeos_ash) { | ||
deps += [ "//chrome/browser/screen_ai:screen_ai_dlc_installer" ] | ||
} |
38 changes: 38 additions & 0 deletions
38
chromium_edits/128.0.6613.186/chrome/browser/about_flags.cc.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc | ||
index 96370d4ac35a9..82bf3f78caccc 100644 | ||
--- a/chrome/browser/about_flags.cc | ||
+++ b/chrome/browser/about_flags.cc | ||
@@ -220,6 +220,7 @@ | ||
#include "third_party/blink/public/common/features_generated.h" | ||
#include "third_party/blink/public/common/forcedark/forcedark_switches.h" | ||
#include "third_party/blink/public/common/switches.h" | ||
+#include "third_party/ipfs_client/ipfs_buildflags.h" | ||
#include "ui/accessibility/accessibility_features.h" | ||
#include "ui/accessibility/accessibility_switches.h" | ||
#include "ui/base/ozone_buildflags.h" | ||
@@ -320,6 +321,10 @@ | ||
#include "extensions/common/switches.h" | ||
#endif // BUILDFLAG(ENABLE_EXTENSIONS) | ||
|
||
+#if BUILDFLAG(ENABLE_IPFS) | ||
+#include "components/ipfs/ipfs_features.h" | ||
+#endif | ||
+ | ||
#if BUILDFLAG(ENABLE_PDF) | ||
#include "pdf/pdf_features.h" | ||
#endif | ||
@@ -10130,6 +10135,14 @@ const FeatureEntry kFeatureEntries[] = { | ||
flag_descriptions::kOmitCorsClientCertDescription, kOsAll, | ||
FEATURE_VALUE_TYPE(network::features::kOmitCorsClientCert)}, | ||
|
||
+#if BUILDFLAG(ENABLE_IPFS) | ||
+ {"enable-ipfs", | ||
+ flag_descriptions::kEnableIpfsName, | ||
+ flag_descriptions::kEnableIpfsDescription, | ||
+ kOsMac | kOsWin | kOsLinux,//TODO: These are the only variants currently getting built, but that is not likely to remain the case | ||
+ FEATURE_VALUE_TYPE(ipfs::kEnableIpfs)}, | ||
+#endif | ||
+ | ||
{"use-idna2008-non-transitional", | ||
flag_descriptions::kUseIDNA2008NonTransitionalName, | ||
flag_descriptions::kUseIDNA2008NonTransitionalDescription, kOsAll, |
51 changes: 51 additions & 0 deletions
51
...128.0.6613.186/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
diff --git a/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc b/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc | ||
index 9f234a2a7d41d..a9378ca80dc1e 100644 | ||
--- a/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc | ||
+++ b/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc | ||
@@ -13,6 +13,7 @@ | ||
#include "chrome/browser/profiles/profile_io_data.h" | ||
#include "components/custom_handlers/protocol_handler_registry.h" | ||
#include "content/public/common/url_constants.h" | ||
+#include "third_party/ipfs_client/ipfs_buildflags.h" | ||
#include "url/url_util.h" | ||
|
||
#if BUILDFLAG(IS_ANDROID) | ||
@@ -20,6 +21,11 @@ | ||
#include "chrome/browser/ui/android/omnibox/jni_headers/ChromeAutocompleteSchemeClassifier_jni.h" | ||
#endif | ||
|
||
+#if BUILDFLAG(ENABLE_IPFS) | ||
+#include "components/ipfs/ipfs_features.h" | ||
+#endif | ||
+ | ||
+ | ||
#if BUILDFLAG(IS_ANDROID) | ||
static jlong | ||
JNI_ChromeAutocompleteSchemeClassifier_CreateAutocompleteClassifier( | ||
@@ -53,12 +59,20 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForScheme( | ||
if (scheme.empty()) { | ||
return metrics::OmniboxInputType::EMPTY; | ||
} | ||
- if (base::IsStringASCII(scheme) && | ||
- (ProfileIOData::IsHandledProtocol(scheme) || | ||
- base::EqualsCaseInsensitiveASCII(scheme, content::kViewSourceScheme) || | ||
- base::EqualsCaseInsensitiveASCII(scheme, url::kJavaScriptScheme) || | ||
- base::EqualsCaseInsensitiveASCII(scheme, url::kDataScheme))) { | ||
- return metrics::OmniboxInputType::URL; | ||
+ if (base::IsStringASCII(scheme)) { | ||
+ if (ProfileIOData::IsHandledProtocol(scheme) || | ||
+ base::EqualsCaseInsensitiveASCII(scheme, content::kViewSourceScheme) || | ||
+ base::EqualsCaseInsensitiveASCII(scheme, url::kJavaScriptScheme) || | ||
+ base::EqualsCaseInsensitiveASCII(scheme, url::kDataScheme)) { | ||
+ return metrics::OmniboxInputType::URL; | ||
+ } | ||
+#if BUILDFLAG(ENABLE_IPFS) | ||
+ if (base::FeatureList::IsEnabled(ipfs::kEnableIpfs) && | ||
+ (base::EqualsCaseInsensitiveASCII(scheme, "ipfs") || base::EqualsCaseInsensitiveASCII(scheme, "ipns")) | ||
+ ) { | ||
+ return metrics::OmniboxInputType::URL; | ||
+ } | ||
+#endif | ||
} | ||
|
||
// Also check for schemes registered via registerProtocolHandler(), which |
81 changes: 81 additions & 0 deletions
81
chromium_edits/128.0.6613.186/chrome/browser/chrome_content_browser_client.cc.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,81 @@ | ||
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc | ||
index c4b98aa0e759f..0b645f5482fca 100644 | ||
--- a/chrome/browser/chrome_content_browser_client.cc | ||
+++ b/chrome/browser/chrome_content_browser_client.cc | ||
@@ -396,6 +396,7 @@ | ||
#include "third_party/blink/public/mojom/browsing_topics/browsing_topics.mojom.h" | ||
#include "third_party/blink/public/mojom/use_counter/metrics/web_feature.mojom.h" | ||
#include "third_party/blink/public/public_buildflags.h" | ||
+#include "third_party/ipfs_client/ipfs_buildflags.h" | ||
#include "third_party/widevine/cdm/buildflags.h" | ||
#include "ui/base/clipboard/clipboard_format_type.h" | ||
#include "ui/base/l10n/l10n_util.h" | ||
@@ -516,6 +517,13 @@ | ||
#include "chrome/browser/chrome_browser_main_posix.h" | ||
#endif | ||
|
||
+#if BUILDFLAG(ENABLE_IPFS) | ||
+#include "chrome/browser/ipfs_extra_parts.h" | ||
+#include "components/ipfs/interceptor.h" | ||
+#include "components/ipfs/ipfs_features.h" | ||
+#include "components/ipfs/url_loader_factory.h" | ||
+#endif | ||
+ | ||
#if !BUILDFLAG(IS_ANDROID) | ||
#include "chrome/browser/digital_credentials/digital_identity_provider_desktop.h" | ||
#include "chrome/browser/preloading/preview/preview_navigation_throttle.h" | ||
@@ -1870,6 +1878,11 @@ ChromeContentBrowserClient::CreateBrowserMainParts(bool is_integration_test) { | ||
main_parts->AddParts( | ||
std::make_unique<ChromeBrowserMainExtraPartsNaclDeprecation>()); | ||
|
||
+#if BUILDFLAG(ENABLE_IPFS) | ||
+ if (base::FeatureList::IsEnabled(ipfs::kEnableIpfs)) { | ||
+ main_parts->AddParts(std::make_unique<IpfsExtraParts>()); | ||
+ } | ||
+#endif | ||
return main_parts; | ||
} | ||
|
||
@@ -6482,12 +6495,29 @@ void ChromeContentBrowserClient:: | ||
const std::optional<url::Origin>& request_initiator_origin, | ||
NonNetworkURLLoaderFactoryMap* factories) { | ||
#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(ENABLE_EXTENSIONS) || \ | ||
- !BUILDFLAG(IS_ANDROID) | ||
+ !BUILDFLAG(IS_ANDROID) || BUILDFLAG(ENABLE_IPFS) | ||
content::RenderFrameHost* frame_host = | ||
RenderFrameHost::FromID(render_process_id, render_frame_id); | ||
WebContents* web_contents = WebContents::FromRenderFrameHost(frame_host); | ||
#endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(ENABLE_EXTENSIONS) || \ | ||
// !BUILDFLAG(IS_ANDROID) | ||
+#if BUILDFLAG(ENABLE_IPFS) | ||
+ if (!web_contents) { | ||
+ VLOG(2) << "No web contents, can't register url loader factory."; | ||
+ } else if (base::FeatureList::IsEnabled(ipfs::kEnableIpfs)) { | ||
+ network::mojom::URLLoaderFactory* default_factory = g_browser_process->system_network_context_manager()->GetURLLoaderFactory(); | ||
+ auto* context = web_contents->GetBrowserContext(); | ||
+ ipfs::IpfsURLLoaderFactory::Create( | ||
+ factories, | ||
+ context, | ||
+ default_factory, | ||
+ GetSystemNetworkContext(), | ||
+ Profile::FromBrowserContext(context)->GetPrefs() | ||
+ ); | ||
+ } else { | ||
+ LOG(INFO) << "IPFS disabled."; | ||
+ } | ||
+#endif // BUILDFLAG(ENABLE_IPFS) | ||
|
||
#if BUILDFLAG(IS_CHROMEOS_ASH) | ||
if (web_contents) { | ||
@@ -6633,6 +6663,11 @@ ChromeContentBrowserClient::WillCreateURLLoaderRequestInterceptors( | ||
scoped_refptr<base::SequencedTaskRunner> navigation_response_task_runner) { | ||
std::vector<std::unique_ptr<content::URLLoaderRequestInterceptor>> | ||
interceptors; | ||
+#if BUILDFLAG(ENABLE_IPFS) | ||
+ if (base::FeatureList::IsEnabled(ipfs::kEnableIpfs)) { | ||
+ interceptors.push_back(std::make_unique<ipfs::Interceptor>(g_browser_process->system_network_context_manager()->GetURLLoaderFactory(), GetSystemNetworkContext())); | ||
+ } | ||
+#endif | ||
#if BUILDFLAG(ENABLE_OFFLINE_PAGES) | ||
interceptors.push_back( | ||
std::make_unique<offline_pages::OfflinePageURLLoaderRequestInterceptor>( |
16 changes: 16 additions & 0 deletions
16
chromium_edits/128.0.6613.186/chrome/browser/flag-metadata.json.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json | ||
index fa225f6564471..e8444d0f88e84 100644 | ||
--- a/chrome/browser/flag-metadata.json | ||
+++ b/chrome/browser/flag-metadata.json | ||
@@ -3386,6 +3386,11 @@ | ||
"owners": [ "[email protected]", "[email protected]" ], | ||
"expiry_milestone": 130 | ||
}, | ||
+ { | ||
+ "name": "enable-ipfs", | ||
+ "owners": [ "//components/ipfs/OWNERS" ], | ||
+ "expiry_milestone": 150 | ||
+ }, | ||
{ | ||
"name": "enable-isolated-sandboxed-iframes", | ||
"owners": [ "[email protected]", "[email protected]", "[email protected]" ], |
16 changes: 16 additions & 0 deletions
16
chromium_edits/128.0.6613.186/chrome/browser/flag_descriptions.cc.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc | ||
index be5b3f2e79a5f..d61281fca8be5 100644 | ||
--- a/chrome/browser/flag_descriptions.cc | ||
+++ b/chrome/browser/flag_descriptions.cc | ||
@@ -302,6 +302,11 @@ const char kEnableBenchmarkingChoiceDefaultFeatureStates[] = | ||
const char kEnableBenchmarkingChoiceMatchFieldTrialTestingConfig[] = | ||
"Match Field Trial Testing Config"; | ||
|
||
+#if BUILDFLAG(ENABLE_IPFS) | ||
+extern const char kEnableIpfsName[] = "Enable IPFS"; | ||
+extern const char kEnableIpfsDescription[] = "Enable ipfs:// and ipns:// URLs"; | ||
+#endif | ||
+ | ||
const char kPreloadingOnPerformancePageName[] = | ||
"Preloading Settings on Performance Page"; | ||
const char kPreloadingOnPerformancePageDescription[] = |
24 changes: 24 additions & 0 deletions
24
chromium_edits/128.0.6613.186/chrome/browser/flag_descriptions.h.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h | ||
index b14d6612eaa86..34aa125a87e57 100644 | ||
--- a/chrome/browser/flag_descriptions.h | ||
+++ b/chrome/browser/flag_descriptions.h | ||
@@ -24,6 +24,7 @@ | ||
#include "pdf/buildflags.h" | ||
#include "printing/buildflags/buildflags.h" | ||
#include "third_party/blink/public/common/buildflags.h" | ||
+#include "third_party/ipfs_client/ipfs_buildflags.h" | ||
|
||
// This file declares strings used in chrome://flags. These messages are not | ||
// translated, because instead of end-users they target Chromium developers and | ||
@@ -195,6 +196,11 @@ extern const char kEnableBenchmarkingChoiceDisabled[]; | ||
extern const char kEnableBenchmarkingChoiceDefaultFeatureStates[]; | ||
extern const char kEnableBenchmarkingChoiceMatchFieldTrialTestingConfig[]; | ||
|
||
+#if BUILDFLAG(ENABLE_IPFS) | ||
+extern const char kEnableIpfsName[]; | ||
+extern const char kEnableIpfsDescription[]; | ||
+#endif | ||
+ | ||
extern const char kFontationsFontBackendName[]; | ||
extern const char kFontationsFontBackendDescription[]; | ||
|
10 changes: 10 additions & 0 deletions
10
chromium_edits/128.0.6613.186/chrome/browser/ipfs_extra_parts.cc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
#include "ipfs_extra_parts.h" | ||
|
||
#include "profiles/profile.h" | ||
|
||
#include <components/ipfs/inter_request_state.h> | ||
|
||
void IpfsExtraParts::PostProfileInit(Profile* profile, bool /* is_initial_profile */ ) { | ||
DCHECK(profile); | ||
ipfs::InterRequestState::CreateForBrowserContext(profile, profile->GetPrefs()); | ||
} |
10 changes: 10 additions & 0 deletions
10
chromium_edits/128.0.6613.186/chrome/browser/ipfs_extra_parts.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
#ifndef IPFS_EXTRA_PART_H_ | ||
#define IPFS_EXTRA_PART_H_ | ||
|
||
#include <chrome/browser/chrome_browser_main_extra_parts.h> | ||
|
||
class IpfsExtraParts : public ChromeBrowserMainExtraParts { | ||
void PostProfileInit(Profile* profile, bool is_initial_profile) override; | ||
}; | ||
|
||
#endif // IPFS_EXTRA_PART_H_ |
37 changes: 37 additions & 0 deletions
37
chromium_edits/128.0.6613.186/chrome/browser/prefs/browser_prefs.cc.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc | ||
index 8cf6b5d7d4281..699490b84fc37 100644 | ||
--- a/chrome/browser/prefs/browser_prefs.cc | ||
+++ b/chrome/browser/prefs/browser_prefs.cc | ||
@@ -199,6 +199,8 @@ | ||
#include "printing/buildflags/buildflags.h" | ||
#include "rlz/buildflags/buildflags.h" | ||
#include "services/screen_ai/buildflags/buildflags.h" | ||
+#include "third_party/ipfs_client/ipfs_buildflags.h" | ||
+ | ||
|
||
#if BUILDFLAG(ENABLE_BACKGROUND_MODE) | ||
#include "chrome/browser/background/background_mode_manager.h" | ||
@@ -244,6 +246,11 @@ | ||
#include "chrome/browser/pdf/pdf_pref_names.h" | ||
#endif // BUILDFLAG(ENABLE_PDF) | ||
|
||
+#if BUILDFLAG(ENABLE_IPFS) | ||
+#include "components/ipfs/ipfs_features.h" | ||
+#include "components/ipfs/preferences.h" | ||
+#endif | ||
+ | ||
#if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) | ||
#include "chrome/browser/screen_ai/pref_names.h" | ||
#endif | ||
@@ -1783,6 +1790,11 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, | ||
IncognitoModePrefs::RegisterProfilePrefs(registry); | ||
invalidation::PerUserTopicSubscriptionManager::RegisterProfilePrefs(registry); | ||
invalidation::InvalidatorRegistrarWithMemory::RegisterProfilePrefs(registry); | ||
+#if BUILDFLAG(ENABLE_IPFS) | ||
+ if (base::FeatureList::IsEnabled(ipfs::kEnableIpfs)) { | ||
+ ipfs::RegisterPreferences(registry); | ||
+ } | ||
+#endif | ||
language::LanguagePrefs::RegisterProfilePrefs(registry); | ||
login_detection::prefs::RegisterProfilePrefs(registry); | ||
lookalikes::RegisterProfilePrefs(registry); |
13 changes: 13 additions & 0 deletions
13
chromium_edits/128.0.6613.186/chrome/browser/shell_integration_mac.mm.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
diff --git a/chrome/browser/shell_integration_mac.mm b/chrome/browser/shell_integration_mac.mm | ||
index c6bb768979453..c0d0abb9c78f3 100644 | ||
--- a/chrome/browser/shell_integration_mac.mm | ||
+++ b/chrome/browser/shell_integration_mac.mm | ||
@@ -79,6 +79,8 @@ bool SetAsDefaultBrowser() { | ||
if (LSSetDefaultHandlerForURLScheme(CFSTR("https"), identifier) != noErr) { | ||
return false; | ||
} | ||
+ LSSetDefaultHandlerForURLScheme(CFSTR("ipfs"), identifier); | ||
+ LSSetDefaultHandlerForURLScheme(CFSTR("ipns"), identifier); | ||
if (LSSetDefaultRoleHandlerForContentType(kUTTypeHTML, kLSRolesViewer, | ||
identifier) != noErr) { | ||
return false; |
Oops, something went wrong.