Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion helium-chromium
Submodule helium-chromium updated 228 files
2 changes: 1 addition & 1 deletion package/helium-bin.spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%define version 0.8.5.1
%define version 0.9.1.1
%global debug_package %{nil}

Name: helium-bin
Expand Down
12 changes: 6 additions & 6 deletions patches/helium/linux/add-error-for-missing-desktop-file.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/chrome/browser/shell_integration.h
+++ b/chrome/browser/shell_integration.h
@@ -100,6 +100,11 @@ enum DefaultWebClientState {
@@ -106,6 +106,11 @@ enum DefaultWebClientState {
// The current install mode is not default, although one of the brand's
// other install modes is.
OTHER_MODE_IS_DEFAULT,
Expand Down Expand Up @@ -84,7 +84,7 @@
profile,
--- a/chrome/browser/ui/webui/settings/settings_default_browser_handler.cc
+++ b/chrome/browser/ui/webui/settings/settings_default_browser_handler.cc
@@ -163,7 +163,11 @@ void DefaultBrowserHandler::OnDefaultChe
@@ -200,7 +200,11 @@ void DefaultBrowserHandler::OnDefaultChe
base::Value::Dict dict;
dict.Set("isDefault", state == shell_integration::IS_DEFAULT);
dict.Set("canPin", can_pin);
Expand Down Expand Up @@ -119,15 +119,15 @@
</if>
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -133,6 +133,7 @@
@@ -135,6 +135,7 @@
#endif

#if BUILDFLAG(IS_LINUX)
+#include "base/environment.h"
#include "ui/display/screen.h"
#endif

@@ -710,6 +711,15 @@ void AddClearBrowsingDataStrings(content
@@ -716,6 +717,15 @@ void AddClearBrowsingDataStrings(content
html_source->AddLocalizedStrings(kLocalizedStrings);
}

Expand All @@ -142,8 +142,8 @@
+
#if !BUILDFLAG(IS_CHROMEOS)
void AddDefaultBrowserStrings(content::WebUIDataSource* html_source) {
html_source->AddString(
@@ -733,9 +743,15 @@ void AddDefaultBrowserStrings(content::W
static constexpr webui::LocalizedString kLocalizedStrings[] = {
@@ -732,9 +742,15 @@ void AddDefaultBrowserStrings(content::W
{"defaultBrowserMakeDefaultButton",
IDS_SETTINGS_DEFAULT_BROWSER_MAKE_DEFAULT_BUTTON},
{"defaultBrowserError", IDS_SETTINGS_DEFAULT_BROWSER_ERROR},
Expand Down
31 changes: 16 additions & 15 deletions patches/helium/linux/add-middle-click-paste-flag.patch
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
--- a/chrome/browser/helium_flag_choices.h
+++ b/chrome/browser/helium_flag_choices.h
@@ -36,6 +36,8 @@ namespace helium {
constexpr const char kHeliumCatUiCommandLine[] = "helium-cat-ui";
constexpr const char kHeliumCatFixedAddressBarCommandLine[] =
"helium-cat-fixed-address-bar";
@@ -35,7 +35,8 @@ namespace helium {
constexpr const char kMiddleClickAutoscrollCommandLine[] = "middle-click-autoscroll";
constexpr const char kHeliumCompactLocationWidthCommandLine[] =
"helium-compact-location-width";
-
+ constexpr const char kMiddleClickPasteEnabledCommandLine[] =
+ "helium-middle-click-paste-enabled";

} // namespace helium

#endif /* CHROME_BROWSER_HELIUM_FLAG_CHOICES_H_ */
--- a/chrome/browser/helium_flag_entries.h
+++ b/chrome/browser/helium_flag_entries.h
@@ -40,4 +40,8 @@
"[CAT] Fixed address bar width",
"Prevents the address bar from shrinking in the CAT layout. Will push toolbar actions outside of bounds on small window sizes, beware. Works only when the main CAT flag is enabled. Early and buggy, stuff will break and/or look weird. Helium flag.",
kOsDesktop, FEATURE_VALUE_TYPE(features::kHeliumCatFixedAddressBar)},
@@ -36,4 +36,8 @@
"Automatic address bar width in compact layout",
"Allows the location bar to automatically reduce its width in the compact browser layout. The omnibox may be uncomfortable to use. Helium flag.",
kOsDesktop, FEATURE_VALUE_TYPE(features::kHeliumCompactLocationWidth)},
+ {helium::kMiddleClickPasteEnabledCommandLine,
+ "Middle Click Paste",
+ "Controls middle click paste functionality. Helium flag.",
Expand All @@ -30,7 +31,7 @@
#include "base/logging.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
@@ -142,6 +143,12 @@ void UpdateFromSystemSettings(blink::Ren
@@ -143,6 +144,12 @@ void UpdateFromSystemSettings(blink::Ren
#endif // BUILDFLAG(USE_AURA)

#if BUILDFLAG(IS_LINUX)
Expand Down Expand Up @@ -70,18 +71,18 @@
}
--- a/ui/base/ui_base_features.cc
+++ b/ui/base/ui_base_features.cc
@@ -449,4 +449,6 @@ BASE_FEATURE(kUseSystemDefaultAccentColo

BASE_FEATURE(kStringWidthCache, base::FEATURE_DISABLED_BY_DEFAULT);
@@ -446,4 +446,6 @@ BASE_FEATURE(kStringWidthCache, base::FE
BASE_FEATURE(kUseClipboardStrictVirtualFileCheck,
base::FEATURE_ENABLED_BY_DEFAULT);

+BASE_FEATURE(kMiddleClickPasteEnabled, base::FEATURE_ENABLED_BY_DEFAULT);
+
} // namespace features
--- a/ui/base/ui_base_features.h
+++ b/ui/base/ui_base_features.h
@@ -270,6 +270,9 @@ BASE_DECLARE_FEATURE(kUseSystemDefaultAc
@@ -274,6 +274,9 @@ BASE_DECLARE_FEATURE(kStringWidthCache);
COMPONENT_EXPORT(UI_BASE_FEATURES)
BASE_DECLARE_FEATURE(kStringWidthCache);
BASE_DECLARE_FEATURE(kUseClipboardStrictVirtualFileCheck);

+COMPONENT_EXPORT(UI_BASE_FEATURES)
+BASE_DECLARE_FEATURE(kMiddleClickPasteEnabled);
Expand Down
2 changes: 1 addition & 1 deletion patches/helium/linux/change-chromium-branding.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -1810,7 +1810,7 @@ if (is_linux || is_chromeos) {
@@ -1812,7 +1812,7 @@ if (is_linux || is_chromeos) {
]
if (is_linux) {
sources += [
Expand Down
2 changes: 1 addition & 1 deletion patches/helium/linux/fix-swipe-between-pages.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/content/common/features.cc
+++ b/content/common/features.cc
@@ -691,7 +691,7 @@ const base::FeatureParam<base::TimeDelta
@@ -694,7 +694,7 @@ const base::FeatureParam<base::TimeDelta
// Allows swipe left/right from touchpad change browser navigation. Currently
// only enabled by default on CrOS and Windows.
BASE_FEATURE(kTouchpadOverscrollHistoryNavigation,
Expand Down
2 changes: 1 addition & 1 deletion patches/helium/linux/rename-chrome-binary.patch
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
}

executable("chrome_initial") {
@@ -1694,19 +1694,19 @@ if (is_linux || is_chromeos) {
@@ -1696,19 +1696,19 @@ if (is_linux || is_chromeos) {
}
}
extract_symbols("chrome_symbols") {
Expand Down
2 changes: 1 addition & 1 deletion patches/helium/linux/use-default-theme.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/ui/linux/linux_ui_factory.cc
+++ b/ui/linux/linux_ui_factory.cc
@@ -197,22 +197,7 @@ SystemTheme GetDefaultSystemTheme() {
@@ -184,22 +184,7 @@ SystemTheme GetDefaultSystemTheme() {
std::unique_ptr<base::Environment> env = base::Environment::Create();

switch (base::nix::GetDesktopEnvironment(env.get())) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
'--no-tools',
'--no-runtimes',
# PIC needed for Rust build (links LLVM into shared object)
@@ -783,7 +786,8 @@ def main():
@@ -789,7 +792,8 @@ def main():
# Fetch sysroot we build rustc against. This ensures a minimum supported
# host (not Chromium target). Since the rustc linux package is for
# x86_64 only, that is the sole needed sysroot.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
--- a/google_apis/api_key_cache.cc
+++ b/google_apis/api_key_cache.cc
@@ -208,13 +208,13 @@ ApiKeyCache::ApiKeyCache(const DefaultAp
@@ -235,14 +235,14 @@ ApiKeyCache::ApiKeyCache(const DefaultAp

std::string default_client_id = CalculateKeyValue(
default_api_keys.google_default_client_id,
- STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), nullptr, std::string(),
+ STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), ::switches::kOAuth2ClientID, std::string(),
environment.get(), command_line, gaia_config,
- STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), std::string(), nullptr,
+ STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), std::string(), ::switches::kOAuth2ClientID,
std::string(), environment.get(), command_line, gaia_config,
default_api_keys.allow_override_via_environment,
default_api_keys.allow_unset_values);
std::string default_client_secret = CalculateKeyValue(
default_api_keys.google_default_client_secret,
- STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), nullptr,
+ STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), ::switches::kOAuth2ClientSecret,
std::string(), environment.get(), command_line, gaia_config,
STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), std::string(),
- nullptr, std::string(), environment.get(), command_line, gaia_config,
+ ::switches::kOAuth2ClientSecret, std::string(), environment.get(), command_line, gaia_config,
default_api_keys.allow_override_via_environment,
default_api_keys.allow_unset_values);