-
Notifications
You must be signed in to change notification settings - Fork 892
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #7969 from /issues/12740
Remove usage of BRAVE_CHROMIUM_BUILD and brave_chromium_build
- Loading branch information
Showing
38 changed files
with
135 additions
and
187 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,13 @@ | ||
| import("//brave/build/config.gni") | ||
|
|
||
| # Changing these will cause a full rebuild | ||
| brave_include_dirs_ = [ | ||
| "//brave/chromium_src", | ||
| ] | ||
| brave_include_dirs_ = [ "//brave/chromium_src" ] | ||
|
|
||
| if (brave_chromium_build) { | ||
| config("compiler") { | ||
| include_dirs = brave_include_dirs_ | ||
| defines = [ "BRAVE_CHROMIUM_BUILD" ] | ||
| } | ||
| } else { | ||
| config("compiler") {} | ||
| config("compiler") { | ||
| include_dirs = brave_include_dirs_ | ||
| } | ||
|
|
||
| # do not expose this as a public config anywhere | ||
| config("version") { | ||
| defines = [ | ||
| "BRAVE_CHROMIUM_VERSION=\"$chrome_version_string\"", | ||
| ] | ||
| defines = [ "BRAVE_CHROMIUM_VERSION=\"$chrome_version_string\"" ] | ||
| } |
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 |
|---|---|---|
| @@ -1,6 +1,4 @@ | ||
| declare_args() { | ||
| brave_chromium_build = true | ||
|
|
||
| brave_services_key = "" | ||
| } | ||
|
|
||
|
|
||
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
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
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 |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| diff --git a/chrome/app/chrome_crash_reporter_client.cc b/chrome/app/chrome_crash_reporter_client.cc | ||
| index b3a7aebffa224c360e3760f816887cb979999c57..cd8cf6856ae1fa1c28f1274ab2db1299d576e9f1 100644 | ||
| index b3a7aebffa224c360e3760f816887cb979999c57..e56f309c199b87d63b32c33effb5e08017224f7f 100644 | ||
| --- a/chrome/app/chrome_crash_reporter_client.cc | ||
| +++ b/chrome/app/chrome_crash_reporter_client.cc | ||
| @@ -154,7 +154,7 @@ bool ChromeCrashReporterClient::IsRunningUnattended() { | ||
| } | ||
|
|
||
| bool ChromeCrashReporterClient::GetCollectStatsConsent() { | ||
| -#if BUILDFLAG(GOOGLE_CHROME_BRANDING) | ||
| +#if BUILDFLAG(GOOGLE_CHROME_BRANDING) || (defined(BRAVE_CHROMIUM_BUILD) && defined(OFFICIAL_BUILD)) | ||
| +#if BUILDFLAG(GOOGLE_CHROME_BRANDING) || defined(OFFICIAL_BUILD) | ||
| bool is_official_chrome_build = true; | ||
| #else | ||
| bool is_official_chrome_build = false; |
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 |
|---|---|---|
| @@ -1,20 +1,20 @@ | ||
| diff --git a/chrome/app/theme/BUILD.gn b/chrome/app/theme/BUILD.gn | ||
| index 57e8917e359a2fc59f567bd33f9340e400e55b1f..b127c994019d8ba1e5750b33c300c2ec9dcf3463 100644 | ||
| index 57e8917e359a2fc59f567bd33f9340e400e55b1f..a4489e2c34d1a02138afb05ccfc72d0129572f3e 100644 | ||
| --- a/chrome/app/theme/BUILD.gn | ||
| +++ b/chrome/app/theme/BUILD.gn | ||
| @@ -21,6 +21,7 @@ grit("theme_resources") { | ||
| ":chrome_unscaled_resources", | ||
| "//ui/resources", | ||
| ] | ||
| + if (brave_chromium_build) { deps += ["//brave/app/theme:brave_theme_resources"]} | ||
| + deps += ["//brave/app/theme:brave_theme_resources"] | ||
|
|
||
| output_dir = "$root_gen_dir/chrome" | ||
| } | ||
| @@ -32,6 +33,7 @@ grit("chrome_unscaled_resources") { | ||
| "grit/chrome_unscaled_resources.h", | ||
| "chrome_unscaled_resources.pak", | ||
| ] | ||
| + if (brave_chromium_build) { deps = ["//brave/app/theme:brave_unscaled_resources"]} | ||
| + deps = ["//brave/app/theme:brave_unscaled_resources"] | ||
|
|
||
| output_dir = "$root_gen_dir/chrome" | ||
| } |
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 |
|---|---|---|
| @@ -1,14 +1,12 @@ | ||
| diff --git a/chrome/browser/net/net_error_tab_helper.cc b/chrome/browser/net/net_error_tab_helper.cc | ||
| index 313758372e0fcb842ee6a5b5cd69a64b8a95b2ac..cc920fb9459462075a1a9c123ae7af34ea5c8ac8 100644 | ||
| index 313758372e0fcb842ee6a5b5cd69a64b8a95b2ac..bc8c3c243dd2f05b5fa9708d1d72bfa9f6dffcc0 100644 | ||
| --- a/chrome/browser/net/net_error_tab_helper.cc | ||
| +++ b/chrome/browser/net/net_error_tab_helper.cc | ||
| @@ -200,6 +200,9 @@ void NetErrorTabHelper::InitializePref(WebContents* contents) { | ||
| @@ -200,6 +200,7 @@ void NetErrorTabHelper::InitializePref(WebContents* contents) { | ||
| } | ||
|
|
||
| bool NetErrorTabHelper::ProbesAllowed() const { | ||
| +#if defined(BRAVE_CHROMIUM_BUILD) | ||
| + return false; | ||
| +#endif | ||
| if (testing_state_ != TESTING_DEFAULT) | ||
| return testing_state_ == TESTING_FORCE_ENABLED; | ||
|
|
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 |
|---|---|---|
| @@ -1,14 +1,12 @@ | ||
| diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc | ||
| index 2f5ed4b15589ffa5bae18d7f06e6776f705f5229..62b9d86de52131eac490aeb41b55a057f4d9373e 100644 | ||
| index 2f5ed4b15589ffa5bae18d7f06e6776f705f5229..a4bd6ab7ef01d4740211eff1de086fe1493f2129 100644 | ||
| --- a/chrome/browser/profiles/profile_io_data.cc | ||
| +++ b/chrome/browser/profiles/profile_io_data.cc | ||
| @@ -248,6 +248,9 @@ bool ProfileIOData::IsHandledProtocol(const std::string& scheme) { | ||
| @@ -248,6 +248,7 @@ bool ProfileIOData::IsHandledProtocol(const std::string& scheme) { | ||
| #endif | ||
| content::kChromeUIScheme, | ||
| content::kChromeUIUntrustedScheme, | ||
| +#if defined(BRAVE_CHROMIUM_BUILD) | ||
| + kBraveUIScheme, | ||
| +#endif | ||
| url::kDataScheme, | ||
| #if BUILDFLAG(IS_CHROMEOS_ASH) | ||
| content::kExternalFileScheme, |
8 changes: 2 additions & 6 deletions
8
patches/chrome-browser-ui-startup-startup_tab_provider.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 |
|---|---|---|
| @@ -1,16 +1,12 @@ | ||
| diff --git a/chrome/browser/ui/startup/startup_tab_provider.cc b/chrome/browser/ui/startup/startup_tab_provider.cc | ||
| index b16e6b9deb6c951007ab6932f028982ca7c74671..b453e5b069bd4721e1ee857e71843b0a5494b2db 100644 | ||
| index b16e6b9deb6c951007ab6932f028982ca7c74671..833666f7469189cb319ea7f1a5fb00ce182972d0 100644 | ||
| --- a/chrome/browser/ui/startup/startup_tab_provider.cc | ||
| +++ b/chrome/browser/ui/startup/startup_tab_provider.cc | ||
| @@ -144,7 +144,11 @@ StartupTabs StartupTabProviderImpl::GetExtensionCheckupTabs( | ||
| @@ -144,6 +144,7 @@ StartupTabs StartupTabProviderImpl::GetExtensionCheckupTabs( | ||
| bool StartupTabProviderImpl::CanShowWelcome(bool is_signin_allowed, | ||
| bool is_supervised_user, | ||
| bool is_force_signin_enabled) { | ||
| +#if defined(BRAVE_CHROMIUM_BUILD) | ||
| + return true; | ||
| +#else | ||
| return is_signin_allowed && !is_supervised_user && !is_force_signin_enabled; | ||
| +#endif | ||
| } | ||
|
|
||
| // static |
Oops, something went wrong.