awesome-bookmarks/helium
3
0
Fork 0
mirror of https://github.com/imputnet/helium.git synced 2026-08-20 00:57:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

update helium patches to 134.0.6998.35

Browse Source
This commit is contained in:
jj
2025-03-08 14:19:27 +00:00
parent 6a7a82ca76
commit fbd2a127e1
20 changed files with 77 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files
patches/helium-ui/adjust-immersive-padding.patch
+2 -2
View File
@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/views/frame/immersive_mode_controller_mac.mm
+++ b/chrome/browser/ui/views/frame/immersive_mode_controller_mac.mm
@@ -41,7 +41,7 @@ namespace {
@@ -42,7 +42,7 @@ namespace {
// values in BrowserNonClientFrameViewMac::GetCaptionButtonInsets don't account
// for a window with an NSToolbar.
constexpr int kTrafficLightsWidth = 62;
@@ -9,7 +9,7 @@
class ImmersiveModeFocusSearchMac : public views::FocusSearch {
public:
@@ -228,11 +228,9 @@ void ImmersiveModeControllerMac::SetEnab
@@ -229,11 +229,9 @@ void ImmersiveModeControllerMac::SetEnab
gfx::Insets ImmersiveModeControllerMac::GetTabStripRegionViewInsets() {
int right_left_inset = kTabAlignmentInset + kTrafficLightsWidth;
patches/helium-ui/app-menu-style.patch
+1 -1
View File
@@ -9,7 +9,7 @@
}
const auto* const color_provider = view->GetColorProvider();
cc::PaintFlags flags;
@@ -1379,7 +1379,7 @@ void AppMenu::PopulateMenu(MenuItemView*
@@ -1393,7 +1393,7 @@ void AppMenu::PopulateMenu(MenuItemView*
// Helper method that adds a background to a menu item.
auto add_menu_row_background = [item](int vertical_margin,
ui::ColorId background_color_id) {
patches/helium-ui/clean-new-tab-page.patch
+1 -1
View File
@@ -12,7 +12,7 @@
+++ b/chrome/browser/resources/new_tab_page/app.html
@@ -1,38 +1,4 @@
<div id="content">
- ${this.lazyRender_ && this.microsoftAuthEnabled_ ? html`
- ${this.lazyRender_ && this.microsoftModuleEnabled_ ? html`
- <iframe id="microsoftAuth" src="${this.microsoftAuthIframePath_}"></iframe>
- ` : ''}
- ${this.lazyRender_ && this.oneGoogleBarEnabled_ ? html`
patches/helium-ui/location-bar-style.patch
+3 -3
View File
@@ -25,7 +25,7 @@
#if BUILDFLAG(OS_LEVEL_GEOLOCATION_PERMISSION_SUPPORTED)
if (features::IsOsLevelGeolocationPermissionSupportEnabled()) {
@@ -476,7 +479,7 @@ bool LocationBarView::IsInitialized() co
@@ -489,7 +492,7 @@ bool LocationBarView::IsInitialized() co
int LocationBarView::GetBorderRadius() const {
return ChromeLayoutProvider::Get()->GetCornerRadiusMetric(
@@ -34,7 +34,7 @@
}
std::unique_ptr<views::Background> LocationBarView::CreateRoundRectBackground(
@@ -746,7 +749,7 @@ void LocationBarView::Layout(PassKey) {
@@ -759,7 +762,7 @@ void LocationBarView::Layout(PassKey) {
// The padding between the left edges of the location bar and the LHS icon
// (e.g. the page info icon, the google G icon, the selected suggestion icon,
// etc)
@@ -43,7 +43,7 @@
// The padding between the LHS icon and the text.
int text_left = 8;
// Indentation to match the suggestion icons & texts.
@@ -1213,7 +1216,7 @@ int LocationBarView::GetMinimumTrailingW
@@ -1226,7 +1229,7 @@ int LocationBarView::GetMinimumTrailingW
}
gfx::Rect LocationBarView::GetLocalBoundsWithoutEndcaps() const {
patches/helium-ui/narrow-layout-provider.patch
+1 -1
View File
@@ -1,6 +1,6 @@
--- a/ui/views/layout/layout_provider.cc
+++ b/ui/views/layout/layout_provider.cc
@@ -197,17 +197,17 @@ ShapeSysTokens GetShapeSysToken(ShapeCon
@@ -199,17 +199,17 @@ ShapeSysTokens GetShapeSysToken(ShapeCon
static constexpr auto shape_token_map =
base::MakeFixedFlatMap<ShapeContextTokens, ShapeSysTokens>({
{ShapeContextTokens::kBadgeRadius, ShapeSysTokens::kXSmall},
patches/helium-ui/remove-toolbar-corners.patch
+4 -4
View File
@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -271,18 +271,6 @@ void ToolbarView::Init() {
@@ -270,18 +270,6 @@ void ToolbarView::Init() {
aura::WindowOcclusionTracker::ScopedPause pause_occlusion;
#endif
@@ -19,7 +19,7 @@
auto location_bar = std::make_unique<LocationBarView>(
browser_, browser_->profile(), browser_->command_controller(), this,
display_mode_ != DisplayMode::NORMAL);
@@ -852,13 +840,6 @@ void ToolbarView::Layout(PassKey) {
@@ -855,13 +843,6 @@ void ToolbarView::Layout(PassKey) {
// The container view should be the exact same size/position as ToolbarView.
container_view_->SetSize(size());
@@ -33,7 +33,7 @@
if (display_mode_ == DisplayMode::CUSTOM_TAB) {
custom_tab_bar_->SetBounds(0, 0, width(),
custom_tab_bar_->GetPreferredSize().height());
@@ -868,7 +849,6 @@ void ToolbarView::Layout(PassKey) {
@@ -871,7 +852,6 @@ void ToolbarView::Layout(PassKey) {
if (display_mode_ == DisplayMode::NORMAL) {
LayoutCommon();
@@ -41,7 +41,7 @@
}
if (toolbar_controller_) {
@@ -906,50 +886,6 @@ void ToolbarView::OnThemeChanged() {
@@ -909,50 +889,6 @@ void ToolbarView::OnThemeChanged() {
SchedulePaint();
}
patches/helium-ui/tab-strip-controls.patch
+1 -1
View File
@@ -9,7 +9,7 @@
class ControlButtonHighlightPathGenerator
: public views::HighlightPathGenerator {
@@ -235,15 +233,11 @@ void TabStripControlButton::UpdateBackgr
@@ -234,15 +232,11 @@ void TabStripControlButton::UpdateBackgr
}
int TabStripControlButton::GetCornerRadius() const {
patches/helium-ui/tab-style.patch
+10 -317
View File
@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/tabs/tab_style.cc
+++ b/chrome/browser/ui/tabs/tab_style.cc
@@ -21,13 +21,13 @@ namespace {
@@ -18,13 +18,13 @@ namespace {
// Thickness in DIPs of the separator painted on the left and right edges of
// the tab.
@@ -16,7 +16,7 @@
constexpr int kChromeRefreshTabHorizontalPadding = 8;
class ChromeRefresh2023TabStyle : public TabStyle {
@@ -107,11 +107,11 @@ int ChromeRefresh2023TabStyle::GetMinimu
@@ -104,11 +104,11 @@ int ChromeRefresh2023TabStyle::GetMinimu
}
int ChromeRefresh2023TabStyle::GetTopCornerRadius() const {
@@ -32,7 +32,7 @@
int ChromeRefresh2023TabStyle::GetTabOverlap() const {
--- a/chrome/browser/ui/views/tabs/tab_group_highlight.cc
+++ b/chrome/browser/ui/views/tabs/tab_group_highlight.cc
@@ -49,33 +49,7 @@ bool TabGroupHighlight::GetCanProcessEve
@@ -47,33 +47,7 @@ void TabGroupHighlight::OnPaint(gfx::Can
}
SkPath TabGroupHighlight::GetPath() const {
@@ -68,7 +68,7 @@
--- a/chrome/browser/ui/views/tabs/tab_style_views.cc
+++ b/chrome/browser/ui/views/tabs/tab_style_views.cc
@@ -213,8 +213,6 @@ SkPath TabStyleViewsImpl::GetPath(TabSty
@@ -201,8 +201,6 @@ SkPath TabStyleViewsImpl::GetPath(TabSty
CHECK(tab());
const int stroke_thickness = GetStrokeThickness(force_active);
@@ -77,323 +77,16 @@
// We'll do the entire path calculation in aligned pixels.
// TODO(dfried): determine if we actually want to use |stroke_thickness| as
// the inset in this case.
@@ -227,250 +225,82 @@ SkPath TabStyleViewsImpl::GetPath(TabSty
GetTopCornerRadiusForWidth(tab()->width()) * scale;
@@ -216,11 +214,7 @@ SkPath TabStyleViewsImpl::GetPath(TabSty
float extension_corner_radius = tab_style()->GetBottomCornerRadius() * scale;
- // Selected, hover, and inactive tab fills are a detached squarcle tab.
// Selected, hover, and inactive tab fills are a detached squarcle tab.
- if ((path_type == TabStyle::PathType::kFill &&
- state != TabStyle::TabSelectionState::kActive) ||
- path_type == TabStyle::PathType::kHighlight ||
- path_type == TabStyle::PathType::kInteriorClip ||
+ float top_content_corner_radius = content_corner_radius;
+ float bottom_content_corner_radius = content_corner_radius;
+ float tab_height = GetLayoutConstant(TAB_HEIGHT) * scale;
+
+ // The tab displays favicon animations that can emerge from the toolbar. The
+ // interior clip needs to extend the entire height of the toolbar to support
+ // this. Detached tab shapes do not need to respect this.
+ if (path_type != TabStyle::PathType::kInteriorClip &&
+ path_type != TabStyle::PathType::kHitTest) {
+ tab_height -= GetLayoutConstant(TAB_STRIP_PADDING) * scale;
+ tab_height -= GetLayoutConstant(TABSTRIP_TOOLBAR_OVERLAP) * scale;
+ }
+
+ // Don't round the bottom corners to avoid creating dead space between tabs.
+ if (path_type == TabStyle::PathType::kHitTest) {
+ bottom_content_corner_radius = 0;
+ }
+
+ int left = aligned_bounds.x() + extension_corner_radius;
+ int top = aligned_bounds.y() + GetLayoutConstant(TAB_STRIP_PADDING) * scale;
+ int right = aligned_bounds.right() - extension_corner_radius;
+ const int bottom = top + tab_height;
+
+ // For maximized and full screen windows, extend the tab hit test to the top
+ // of the tab, encompassing the top padding. This makes it easy to click on
+ // tabs by moving the mouse to the top of the screen.
+ if (path_type == TabStyle::PathType::kHitTest &&
+ tab()->controller()->IsFrameCondensed()) {
+ top -= GetLayoutConstant(TAB_STRIP_PADDING) * scale;
+ // Don't round the top corners to avoid creating dead space between tabs.
+ top_content_corner_radius = 0;
+ }
+
+ // if the size of the space for the path is smaller than the size of a
+ // favicon or if we are building a path for the hit test, expand to take the
+ // entire width of the separator margins AND the separator.
+ if ((right - left) < (gfx::kFaviconSize * scale) ||
path_type == TabStyle::PathType::kHitTest) {
- // TODO (crbug.com/1451400): This constant should be unified with
- // kCRtabstripRegionViewControlPadding in tab_strip_region_view.
-
- float top_content_corner_radius = content_corner_radius;
- float bottom_content_corner_radius = content_corner_radius;
- float tab_height = GetLayoutConstant(TAB_HEIGHT) * scale;
-
- // The tab displays favicon animations that can emerge from the toolbar. The
- // interior clip needs to extend the entire height of the toolbar to support
- // this. Detached tab shapes do not need to respect this.
- if (path_type != TabStyle::PathType::kInteriorClip &&
- path_type != TabStyle::PathType::kHitTest) {
- tab_height -= GetLayoutConstant(TAB_STRIP_PADDING) * scale;
- tab_height -= GetLayoutConstant(TABSTRIP_TOOLBAR_OVERLAP) * scale;
- }
-
- // Don't round the bottom corners to avoid creating dead space between tabs.
- if (path_type == TabStyle::PathType::kHitTest) {
- bottom_content_corner_radius = 0;
- }
-
- int left = aligned_bounds.x() + extension_corner_radius;
- int top = aligned_bounds.y() + GetLayoutConstant(TAB_STRIP_PADDING) * scale;
- int right = aligned_bounds.right() - extension_corner_radius;
- const int bottom = top + tab_height;
-
- // For maximized and full screen windows, extend the tab hit test to the top
- // of the tab, encompassing the top padding. This makes it easy to click on
- // tabs by moving the mouse to the top of the screen.
- if (path_type == TabStyle::PathType::kHitTest &&
- tab()->controller()->IsFrameCondensed()) {
- top -= GetLayoutConstant(TAB_STRIP_PADDING) * scale;
- // Don't round the top corners to avoid creating dead space between tabs.
- top_content_corner_radius = 0;
- }
-
- // if the size of the space for the path is smaller than the size of a
- // favicon or if we are building a path for the hit test, expand to take the
- // entire width of the separator margins AND the separator.
- if ((right - left) < (gfx::kFaviconSize * scale) ||
- path_type == TabStyle::PathType::kHitTest) {
- // Take the entire size of the separator. in odd separator size cases, the
- // right side will take the remaining space.
- const int left_separator_overlap =
- tab_style()->GetSeparatorSize().width() / 2;
- const int right_separator_overlap =
- tab_style()->GetSeparatorSize().width() - left_separator_overlap;
-
- // If there is a tab before this one, then expand into its overlap.
- const Tab* const previous_tab =
- tab()->controller()->GetAdjacentTab(tab(), -1);
- if (previous_tab) {
- left -= (tab_style()->GetSeparatorMargins().right() +
- left_separator_overlap) *
- scale;
- }
-
- // If there is a tab after this one, then expand into its overlap.
- const Tab* const next_tab = tab()->controller()->GetAdjacentTab(tab(), 1);
- if (next_tab) {
- right += (tab_style()->GetSeparatorMargins().left() +
- right_separator_overlap) *
- scale;
- }
+ // Take the entire size of the separator. in odd separator size cases, the
+ // right side will take the remaining space.
+ const int left_separator_overlap =
+ tab_style()->GetSeparatorSize().width() / 2;
+ const int right_separator_overlap =
+ tab_style()->GetSeparatorSize().width() - left_separator_overlap;
+
+ // If there is a tab before this one, then expand into its overlap.
+ const Tab* const previous_tab =
+ tab()->controller()->GetAdjacentTab(tab(), -1);
+ if (previous_tab) {
+ left -= (tab_style()->GetSeparatorMargins().right() +
+ left_separator_overlap) *
+ scale;
+ }
+
+ // If there is a tab after this one, then expand into its overlap.
+ const Tab* const next_tab = tab()->controller()->GetAdjacentTab(tab(), 1);
+ if (next_tab) {
+ right += (tab_style()->GetSeparatorMargins().left() +
+ right_separator_overlap) *
+ scale;
}
-
- // Radii are clockwise from top left.
- const SkVector radii[4] = {
- SkVector(top_content_corner_radius, top_content_corner_radius),
- SkVector(top_content_corner_radius, top_content_corner_radius),
- SkVector(bottom_content_corner_radius, bottom_content_corner_radius),
- SkVector(bottom_content_corner_radius, bottom_content_corner_radius)};
- SkRRect rrect;
- rrect.setRectRadii(SkRect::MakeLTRB(left, top, right, bottom), radii);
- SkPath path;
- path.addRRect(rrect);
-
- // Convert path to be relative to the tab origin.
- gfx::PointF origin(tab()->origin());
- origin.Scale(scale);
- path.offset(-origin.x(), -origin.y());
-
- // Possibly convert back to DIPs.
- if (render_units == TabStyle::RenderUnits::kDips && scale != 1.0f) {
- path.transform(SkMatrix::Scale(1.0f / scale, 1.0f / scale));
- }
-
- return path;
- }
-
- // Compute |extension| as the width outside the separators. This is a fixed
- // value equal to the normal corner radius.
- const float extension = extension_corner_radius;
-
- // Calculate the bounds of the actual path.
- const float left = aligned_bounds.x();
- const float right = aligned_bounds.right();
- float tab_top =
- aligned_bounds.y() + GetLayoutConstant(TAB_STRIP_PADDING) * scale;
- float tab_left = left + extension;
- float tab_right = right - extension;
-
- // Overlap the toolbar below us so that gaps don't occur when rendering at
- // non-integral display scale factors.
- const float extended_bottom = aligned_bounds.bottom();
- const float bottom_extension =
- GetLayoutConstant(TABSTRIP_TOOLBAR_OVERLAP) * scale;
- float tab_bottom = extended_bottom - bottom_extension;
-
- // Path-specific adjustments:
- const float stroke_adjustment = stroke_thickness * scale;
- bool extend_to_top = false;
- if (path_type == TabStyle::PathType::kFill ||
- path_type == TabStyle::PathType::kBorder) {
- tab_left += 0.5f * stroke_adjustment;
- tab_right -= 0.5f * stroke_adjustment;
- tab_top += 0.5f * stroke_adjustment;
- content_corner_radius -= 0.5f * stroke_adjustment;
- tab_bottom -= 0.5f * stroke_adjustment;
- extension_corner_radius -= 0.5f * stroke_adjustment;
}
- const ShapeModifier shape_modifier = GetShapeModifier(path_type);
- const bool extend_left_to_bottom = shape_modifier & kNoLowerLeftArc;
- const bool extend_right_to_bottom = shape_modifier & kNoLowerRightArc;
- const bool compact_left_to_bottom =
- !extend_left_to_bottom && (shape_modifier & kCompactLeftArc);
+ // Radii are clockwise from top left.
+ const SkVector radii[4] = {
+ SkVector(top_content_corner_radius, top_content_corner_radius),
+ SkVector(top_content_corner_radius, top_content_corner_radius),
+ SkVector(bottom_content_corner_radius, bottom_content_corner_radius),
+ SkVector(bottom_content_corner_radius, bottom_content_corner_radius)};
+ SkRRect rrect;
+ rrect.setRectRadii(SkRect::MakeLTRB(left, top, right, bottom), radii);
SkPath path;
-
- float left_extension_corner_radius = extension_corner_radius;
- if (compact_left_to_bottom) {
- left_extension_corner_radius = (tab_style()->GetBottomCornerRadius() -
- GetLayoutConstant(TOOLBAR_CORNER_RADIUS)) *
- scale;
- }
-
- // Avoid mallocs at every new path verb by preallocating an
- // empirically-determined amount of space in the verb and point buffers.
- const int kMaxPathPoints = 20;
- path.incReserve(kMaxPathPoints);
-
- // We will go clockwise from the lower left. We start in the overlap region,
- // preventing a gap between toolbar and tabstrip.
- // TODO(dfried): verify that the we actually want to start the stroke for
- // the exterior path outside the region; we might end up rendering an
- // extraneous descending pixel on displays with odd scaling and nonzero
- // stroke width.
-
- // Start with the left side of the shape.
- path.moveTo(left, extended_bottom);
-
- if (tab_left != left) {
- // Draw the left edge of the extension.
- // ╭─────────╮
- // │ Content │
- // ┏─╯ ╰─┐
- if (tab_bottom != extended_bottom) {
- path.lineTo(left, tab_bottom);
- }
-
- // Draw the bottom-left corner.
- // ╭─────────╮
- // │ Content │
- // ┌━╝ ╰─┐
- if (extend_left_to_bottom) {
- path.lineTo(tab_left, tab_bottom);
- } else {
- path.lineTo(tab_left - left_extension_corner_radius, tab_bottom);
- path.arcTo(left_extension_corner_radius, left_extension_corner_radius, 0,
- SkPath::kSmall_ArcSize, SkPathDirection::kCCW, tab_left,
- tab_bottom - left_extension_corner_radius);
- }
- }
-
- // Draw the ascender and top-left curve, if present.
- if (extend_to_top) {
- // ┎─────────╮
- // ┃ Content │
- // ┌─╯ ╰─┐
- path.lineTo(tab_left, tab_top);
- } else {
- // ╔─────────╮
- // ┃ Content │
- // ┌─╯ ╰─┐
- path.lineTo(tab_left, tab_top + content_corner_radius);
- path.arcTo(content_corner_radius, content_corner_radius, 0,
- SkPath::kSmall_ArcSize, SkPathDirection::kCW,
- tab_left + content_corner_radius, tab_top);
- }
-
- // Draw the top crossbar and top-right curve, if present.
- if (extend_to_top) {
- // ┌━━━━━━━━━┑
- // │ Content │
- // ┌─╯ ╰─┐
- path.lineTo(tab_right, tab_top);
- } else {
- // ╭━━━━━━━━━╗
- // │ Content │
- // ┌─╯ ╰─┐
- path.lineTo(tab_right - content_corner_radius, tab_top);
- path.arcTo(content_corner_radius, content_corner_radius, 0,
- SkPath::kSmall_ArcSize, SkPathDirection::kCW, tab_right,
- tab_top + content_corner_radius);
- }
-
- if (tab_right != right) {
- // Draw the descender and bottom-right corner.
- // ╭─────────╮
- // │ Content ┃
- // ┌─╯ ╚━┐
- if (extend_right_to_bottom) {
- path.lineTo(tab_right, tab_bottom);
- } else {
- path.lineTo(tab_right, tab_bottom - extension_corner_radius);
- path.arcTo(extension_corner_radius, extension_corner_radius, 0,
- SkPath::kSmall_ArcSize, SkPathDirection::kCCW,
- tab_right + extension_corner_radius, tab_bottom);
- }
- if (tab_bottom != extended_bottom) {
- path.lineTo(right, tab_bottom);
- }
- }
-
- // Draw anything remaining: the descender, the bottom right horizontal
- // stroke, or the right edge of the extension, depending on which
- // conditions fired above.
- // ╭─────────╮
- // │ Content │
- // ┌─╯ ╰─┓
- path.lineTo(right, extended_bottom);
-
- if (path_type != TabStyle::PathType::kBorder) {
- path.close();
- }
+ path.addRRect(rrect);
// Convert path to be relative to the tab origin.
- gfx::PointF origin(tab_->origin());
+ gfx::PointF origin(tab()->origin());
origin.Scale(scale);
path.offset(-origin.x(), -origin.y());
- path_type == TabStyle::PathType::kHitTest) {
+ if ((true)) {
// TODO (crbug.com/1451400): This constant should be unified with
// kCRtabstripRegionViewControlPadding in tab_strip_region_view.
patches/helium-ui/toolbar-style.patch
+1 -1
View File
@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/views/toolbar/pinned_action_toolbar_button.cc
+++ b/chrome/browser/ui/views/toolbar/pinned_action_toolbar_button.cc
@@ -63,7 +63,7 @@ PinnedActionToolbarButton::PinnedActionT
@@ -60,7 +60,7 @@ PinnedActionToolbarButton::PinnedActionT
SetHorizontalAlignment(gfx::ALIGN_CENTER);
SetProperty(
views::kMarginsKey,
patches/helium/add-kagi-search.patch
+4 -4
View File
@@ -1,6 +1,6 @@
--- a/components/search_engines/prepopulated_engines.json
+++ b/components/search_engines/prepopulated_engines.json
@@ -165,6 +165,17 @@
--- a/third_party/search_engines_data/resources/definitions/prepopulated_engines.json
+++ b/third_party/search_engines_data/resources/definitions/prepopulated_engines.json
@@ -163,6 +163,17 @@
"id": 1
},
@@ -31,7 +31,7 @@
--- a/tools/metrics/histograms/enums.xml
+++ b/tools/metrics/histograms/enums.xml
@@ -28138,6 +28138,7 @@ Called by update_net_error_codes.py.-->
@@ -21034,6 +21034,7 @@ Called by update_net_error_codes.py.-->
<int value="72" label="YouSearch"/>
<int value="73" label="StarterPackGemini"/>
<int value="74" label="Lilo"/>
patches/helium/add-native-bangs.patch
+14 -14
View File
@@ -34,7 +34,7 @@
#endif // COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_DATA_UTIL_H_
--- a/components/search_engines/BUILD.gn
+++ b/components/search_engines/BUILD.gn
@@ -37,6 +37,8 @@ static_library("search_engines") {
@@ -36,6 +36,8 @@ static_library("search_engines") {
"search_terms_data.h",
"template_url.cc",
"template_url.h",
@@ -45,15 +45,15 @@
"template_url_data_util.cc",
--- a/components/search_engines/template_url_data_util.cc
+++ b/components/search_engines/template_url_data_util.cc
@@ -14,6 +14,7 @@
#include "components/search_engines/prepopulated_engines.h"
@@ -13,6 +13,7 @@
#include "components/search_engines/default_search_manager.h"
#include "components/search_engines/template_url_data.h"
#include "components/search_engines/template_url_starter_pack_data.h"
+#include "components/search_engines/template_url_bang_manager.h"
#include "third_party/search_engines_data/resources/definitions/prepopulated_engines.h"
#include "ui/base/l10n/l10n_util.h"
#include "url/gurl.h"
@@ -533,3 +534,20 @@ std::unique_ptr<TemplateURLData> Templat
@@ -507,3 +508,20 @@ std::unique_ptr<TemplateURLData> Templat
return turl;
}
@@ -76,7 +76,7 @@
+}
--- a/components/search_engines/template_url_service.cc
+++ b/components/search_engines/template_url_service.cc
@@ -57,7 +57,9 @@
@@ -56,7 +56,9 @@
#include "components/search_engines/search_engines_switches.h"
#include "components/search_engines/search_terms_data.h"
#include "components/search_engines/template_url.h"
@@ -86,7 +86,7 @@
#include "components/search_engines/template_url_prepopulate_data.h"
#include "components/search_engines/template_url_service_client.h"
#include "components/search_engines/template_url_service_observer.h"
@@ -70,6 +72,7 @@
@@ -69,6 +71,7 @@
#include "components/sync/protocol/search_engine_specifics.pb.h"
#include "components/url_formatter/url_fixer.h"
#include "net/base/registry_controlled_domains/registry_controlled_domain.h"
@@ -94,7 +94,7 @@
#include "url/gurl.h"
#include "url/origin.h"
@@ -389,6 +392,7 @@ class TemplateURLService::PreLoadingProv
@@ -423,6 +426,7 @@ class TemplateURLService::PreLoadingProv
// TemplateURLService ---------------------------------------------------------
TemplateURLService::TemplateURLService(
PrefService& prefs,
@@ -102,7 +102,7 @@
search_engines::SearchEngineChoiceService& search_engine_choice_service,
std::unique_ptr<SearchTermsData> search_terms_data,
const scoped_refptr<KeywordWebDataService>& web_data_service,
@@ -399,6 +403,8 @@ TemplateURLService::TemplateURLService(
@@ -433,6 +437,8 @@ TemplateURLService::TemplateURLService(
search_engine_choice_service_(search_engine_choice_service),
search_terms_data_(std::move(search_terms_data)),
web_data_service_(web_data_service),
@@ -111,7 +111,7 @@
client_(std::move(client)),
dsp_change_callback_(dsp_change_callback),
pre_loading_providers_(std::make_unique<PreLoadingProviders>()),
@@ -414,10 +420,12 @@ TemplateURLService::TemplateURLService(
@@ -448,10 +454,12 @@ TemplateURLService::TemplateURLService(
TemplateURLService::TemplateURLService(
PrefService& prefs,
@@ -124,7 +124,7 @@
search_engine_choice_service,
/*search_terms_data=*/std::make_unique<SearchTermsData>(),
/*web_data_service=*/nullptr,
@@ -1400,11 +1408,25 @@ void TemplateURLService::Load() {
@@ -1390,11 +1398,25 @@ void TemplateURLService::Load() {
if (web_data_service_) {
load_handle_ = web_data_service_->GetKeywords(this);
@@ -181,7 +181,7 @@
search_engines::SearchEngineChoiceService& search_engine_choice_service,
base::span<const TemplateURLService::Initializer> initializers = {});
@@ -706,6 +710,8 @@ class TemplateURLService final : public
@@ -686,6 +690,8 @@ class TemplateURLService final : public
void Init();
@@ -190,7 +190,7 @@
// Simulate a loaded `TemplateURLService`.
void ApplyInitializersForTesting(
base::span<const TemplateURLService::Initializer> initializers);
@@ -921,6 +927,10 @@ class TemplateURLService final : public
@@ -885,6 +891,10 @@ class TemplateURLService final : public
// Service used to store entries.
scoped_refptr<KeywordWebDataService> web_data_service_;
@@ -433,7 +433,7 @@
+
--- a/components/omnibox/browser/autocomplete_input.cc
+++ b/components/omnibox/browser/autocomplete_input.cc
@@ -729,9 +729,9 @@ bool AutocompleteInput::HasHTTPSScheme(c
@@ -743,9 +743,9 @@ bool AutocompleteInput::HasHTTPSScheme(c
// static
AutocompleteInput::FeaturedKeywordMode
AutocompleteInput::GetFeaturedKeywordMode(const std::u16string& text) {
patches/helium/break-chrome-webstore-update-url.patch
+1 -1
View File
@@ -1,6 +1,6 @@
--- a/extensions/common/extension_urls.cc
+++ b/extensions/common/extension_urls.cc
@@ -41,7 +41,7 @@ const GURL* g_item_snippet_url_for_test_
@@ -42,7 +42,7 @@ const GURL* g_item_snippet_url_for_test_
const char kChromeWebstoreBaseURL[] = "https://chrome.google.com/webstore";
const char kNewChromeWebstoreBaseURL[] = "https://chromewebstore.google.com/";
const char kChromeWebstoreUpdateURL[] =
patches/helium/copy-page-url-shortcut.patch
+1 -1
View File
@@ -33,7 +33,7 @@
ui::VKEY_N},
--- a/chrome/browser/ui/views/accelerator_table.cc
+++ b/chrome/browser/ui/views/accelerator_table.cc
@@ -255,7 +255,7 @@ const AcceleratorMapping kDevToolsAccele
@@ -254,7 +254,7 @@ const AcceleratorMapping kDevToolsAccele
{ui::VKEY_J, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
IDC_DEV_TOOLS_CONSOLE},
{ui::VKEY_C, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
patches/helium/enable-tab-muting.patch
+1 -1
View File
@@ -1,6 +1,6 @@
--- a/media/base/media_switches.cc
+++ b/media/base/media_switches.cc
@@ -330,7 +330,7 @@ BASE_FEATURE(kPictureInPictureOcclusionT
@@ -323,7 +323,7 @@ BASE_FEATURE(kPictureInPictureOcclusionT
// Enables user control over muting tab audio from the tab strip.
BASE_FEATURE(kEnableTabMuting,
"EnableTabMuting",
patches/helium/force-eu-search-features.patch
+7 -9
View File
@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -32,7 +32,6 @@
@@ -31,7 +31,6 @@
#include "chrome/browser/profiles/profile_attributes_storage.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/profiles/profile_shortcut_manager.h"
@@ -8,7 +8,7 @@
#include "chrome/browser/signin/account_consistency_mode_manager.h"
#include "chrome/browser/signin/account_consistency_mode_manager_factory.h"
#include "chrome/browser/signin/chrome_signin_client_factory.h"
@@ -86,7 +85,6 @@
@@ -85,7 +84,6 @@
#include "components/safe_browsing/core/common/features.h"
#include "components/safe_browsing/core/common/hashprefix_realtime/hash_realtime_utils.h"
#include "components/saved_tab_groups/public/features.h"
@@ -16,7 +16,7 @@
#include "components/signin/public/base/signin_buildflags.h"
#include "components/signin/public/base/signin_switches.h"
#include "components/strings/grit/components_branded_strings.h"
@@ -2350,16 +2348,9 @@ void AddSearchStrings(content::WebUIData
@@ -2362,16 +2360,9 @@ void AddSearchStrings(content::WebUIData
html_source->AddString("searchExplanationLearnMoreURL",
chrome::kOmniboxLearnMoreURL);
@@ -36,13 +36,11 @@
"saveGuestChoiceText", IDS_SEARCH_ENGINE_CHOICE_GUEST_SESSION_CHECKBOX);
--- a/components/search_engines/search_engine_choice/search_engine_choice_utils.cc
+++ b/components/search_engines/search_engine_choice/search_engine_choice_utils.cc
@@ -142,9 +142,7 @@ ChoiceScreenData::~ChoiceScreenData() =
@@ -140,7 +140,7 @@ ChoiceScreenData::ChoiceScreenData(
ChoiceScreenData::~ChoiceScreenData() = default;
bool IsEeaChoiceCountry(int country_id) {
// Consider the search engine list command line country override as an EEA
// region country to display the search engine choice screen.
- return HasSearchEngineCountryListOverride()
- ? true
- : kEeaChoiceCountriesIds.contains(country_id);
- return regional_capabilities::IsEeaCountry(country_id);
+ return true;
}
patches/helium/make-ddg-default.patch
+4 -13
View File
@@ -1,6 +1,6 @@
--- a/components/search_engines/prepopulated_engines.json
+++ b/components/search_engines/prepopulated_engines.json
@@ -155,31 +155,13 @@
--- a/third_party/search_engines_data/resources/definitions/prepopulated_engines.json
+++ b/third_party/search_engines_data/resources/definitions/prepopulated_engines.json
@@ -153,29 +153,13 @@
// *** *** *** *** WARNING *** *** *** ***
// TODO(crbug.com/343792225): Identify a way to resolve this problem and implement
// necessary changes.
@@ -15,10 +15,8 @@
- "image_translate_url": "{google:baseSearchByImageURL}upload?filtertype=tr&{imageTranslateSourceLocale}{imageTranslateTargetLocale}",
- "contextual_search_url": "{google:baseURL}_/contextualsearch?{google:contextualSearchVersion}{google:contextualSearchContextData}",
- "image_url_post_params": "encoded_image={google:imageThumbnail},image_url={google:imageURL},sbisrc={google:imageSearchSource},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},processed_image_dimensions={google:processedImageDimensions}",
- "side_search_param": "sidesearch",
- "image_translate_source_language_param_key": "sourcelang",
- "image_translate_target_language_param_key": "targetlang",
- "side_image_search_param": "sideimagesearch",
- "search_intent_params": ["si", "gs_ssp"],
- "alternate_urls": [
- "{google:baseURL}#q={searchTerms}",
@@ -36,13 +34,6 @@
"id": 1
},
@@ -1483,4 +1465,4 @@
"generate_array": {
"array_name": "kAllEngines"
}
-}
\ No newline at end of file
+}
--- a/components/search_engines/search_engine_countries-inc.cc
+++ b/components/search_engines/search_engine_countries-inc.cc
@@ -38,1416 +38,17 @@ struct EngineAndTier {
@@ -1467,7 +1458,7 @@
for (size_t i = 0; i < num_engines; i++) {
--- a/components/search_engines/template_url_prepopulate_data.cc
+++ b/components/search_engines/template_url_prepopulate_data.cc
@@ -318,7 +318,7 @@ std::unique_ptr<TemplateURLData> GetPrep
@@ -319,7 +319,7 @@ std::unique_ptr<TemplateURLData> GetPrep
PrefService* prefs,
search_engines::SearchEngineChoiceService* search_engine_choice_service) {
return FindPrepopulatedEngineInternal(prefs, search_engine_choice_service,
patches/helium/proxy-extension-downloads.patch
+2 -2
View File
@@ -1,6 +1,6 @@
--- a/extensions/common/extension_urls.cc
+++ b/extensions/common/extension_urls.cc
@@ -42,6 +42,8 @@ const char kChromeWebstoreBaseURL[] = "h
@@ -43,6 +43,8 @@ const char kChromeWebstoreBaseURL[] = "h
const char kNewChromeWebstoreBaseURL[] = "https://chromewebstore.google.com/";
const char kChromeWebstoreUpdateURL[] =
"https://clients2.google.com/service/update2/crx";
@@ -9,7 +9,7 @@
const char kAppMenuUtmSource[] = "ext_app_menu";
const char kExtensionsMenuUtmSource[] = "ext_extensions_menu";
@@ -99,13 +101,10 @@ base::AutoReset<const GURL*> SetItemSnip
@@ -100,13 +102,10 @@ base::AutoReset<const GURL*> SetItemSnip
}
GURL GetDefaultWebstoreUpdateUrl() {
patches/helium/unbreak-chrome-webstore-url.patch
+16
View File
@@ -0,0 +1,16 @@
--- a/extensions/common/extension_urls.cc
+++ b/extensions/common/extension_urls.cc
@@ -39,10 +39,10 @@ const GURL* g_item_snippet_url_for_test_
} // namespace
-const char kChromeWebstoreBaseURL[] = "trk:09:https://chrome.google.com/webstore";
-const char kNewChromeWebstoreBaseURL[] = "trk:08:https://chromewebstore.google.com/";
+const char kChromeWebstoreBaseURL[] = "https://chrome.google.com/webstore";
+const char kNewChromeWebstoreBaseURL[] = "https://chromewebstore.google.com/";
const char kChromeWebstoreUpdateURL[] =
- "trk:05:https://clients2.google.com/service/update2/crx";
+ "https://clients2.google.com/service/update2/crx";
const char kAppMenuUtmSource[] = "ext_app_menu";
const char kExtensionsMenuUtmSource[] = "ext_extensions_menu";
patches/helium/update-default-browser-prefs.patch
+2 -2
View File
@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/browser_ui_prefs.cc
+++ b/chrome/browser/ui/browser_ui_prefs.cc
@@ -61,7 +61,7 @@ void RegisterBrowserPrefs(PrefRegistrySi
@@ -60,7 +60,7 @@ void RegisterBrowserPrefs(PrefRegistrySi
registry->RegisterBooleanPref(prefs::kHoverCardImagesEnabled, true);
@@ -9,7 +9,7 @@
#if defined(USE_AURA)
registry->RegisterBooleanPref(prefs::kOverscrollHistoryNavigationEnabled,
@@ -118,7 +118,7 @@ void RegisterBrowserUserPrefs(user_prefs
@@ -117,7 +117,7 @@ void RegisterBrowserUserPrefs(user_prefs
// We need to register the type of these preferences in order to query
// them even though they're only typically controlled via policy.
patches/series
+1
View File
@@ -115,6 +115,7 @@ helium/add-kagi-search.patch
helium/copy-page-url-shortcut.patch
helium/update-default-browser-prefs.patch
helium/unbreak-chrome-webstore-url.patch
helium/proxy-extension-downloads.patch
helium/reenable-update-checks.patch
helium/download-icons-from-source.patch