mirror of
https://github.com/imputnet/helium.git
synced 2026-08-20 00:57:32 +02:00
patches: refresh for chromium 146.0.7680.153
This commit is contained in:
@@ -217,7 +217,7 @@
|
||||
.Append(kVerifiedContentsFilename);
|
||||
--- a/extensions/browser/renderer_startup_helper.cc
|
||||
+++ b/extensions/browser/renderer_startup_helper.cc
|
||||
@@ -731,6 +731,18 @@ void RendererStartupHelper::GetMessageBu
|
||||
@@ -740,6 +740,18 @@ void RendererStartupHelper::GetMessageBu
|
||||
paths_to_load.push_back(imported_extension->path());
|
||||
}
|
||||
|
||||
|
||||
@@ -810,7 +810,7 @@
|
||||
optional KeywordModeEntryMethod keyword_mode_entry_method = 20;
|
||||
--- a/chrome/browser/ui/omnibox/omnibox_edit_model.h
|
||||
+++ b/chrome/browser/ui/omnibox/omnibox_edit_model.h
|
||||
@@ -312,6 +312,9 @@ class OmniboxEditModel {
|
||||
@@ -308,6 +308,9 @@ class OmniboxEditModel {
|
||||
return !is_keyword_hint_ && !keyword_.empty();
|
||||
}
|
||||
|
||||
@@ -820,7 +820,7 @@
|
||||
// Accepts the current keyword hint as a keyword. `entry_method` indicates how
|
||||
// the user entered keyword mode.
|
||||
void AcceptKeyword(
|
||||
@@ -677,6 +680,10 @@ class OmniboxEditModel {
|
||||
@@ -673,6 +676,10 @@ class OmniboxEditModel {
|
||||
// triggering is enabled, false otherwise.
|
||||
bool AllowKeywordSpaceTriggering() const;
|
||||
|
||||
@@ -833,7 +833,7 @@
|
||||
// - youtube| -> youtube | (a space was appended to a keyword)
|
||||
--- a/chrome/browser/ui/omnibox/omnibox_edit_model.cc
|
||||
+++ b/chrome/browser/ui/omnibox/omnibox_edit_model.cc
|
||||
@@ -906,6 +906,24 @@ void OmniboxEditModel::OpenCurrentSelect
|
||||
@@ -893,6 +893,24 @@ void OmniboxEditModel::OpenCurrentSelect
|
||||
OpenSelection(popup_selection_, timestamp, disposition, via_keyboard);
|
||||
}
|
||||
|
||||
@@ -858,7 +858,7 @@
|
||||
void OmniboxEditModel::AcceptKeyword(
|
||||
OmniboxEventProto::KeywordModeEntryMethod entry_method) {
|
||||
TRACE_EVENT0("omnibox", "OmniboxEditModel::AcceptKeyword");
|
||||
@@ -914,6 +932,17 @@ void OmniboxEditModel::AcceptKeyword(
|
||||
@@ -901,6 +919,17 @@ void OmniboxEditModel::AcceptKeyword(
|
||||
|
||||
controller_->StopAutocomplete(/*clear_result=*/false);
|
||||
|
||||
@@ -876,7 +876,7 @@
|
||||
SetIsKeywordHint(false);
|
||||
keyword_mode_entry_method_ = entry_method;
|
||||
if (original_user_text_with_keyword_.empty()) {
|
||||
@@ -956,9 +985,6 @@ void OmniboxEditModel::AcceptKeyword(
|
||||
@@ -943,9 +972,6 @@ void OmniboxEditModel::AcceptKeyword(
|
||||
}
|
||||
|
||||
base::RecordAction(base::UserMetricsAction("AcceptedKeywordHint"));
|
||||
@@ -886,7 +886,7 @@
|
||||
EmitEnteredKeywordModeHistogram(entry_method, turl, !user_text_.empty());
|
||||
}
|
||||
|
||||
@@ -2881,6 +2907,21 @@ bool OmniboxEditModel::AllowKeywordSpace
|
||||
@@ -2868,6 +2894,21 @@ bool OmniboxEditModel::AllowKeywordSpace
|
||||
return GetPrefService()->GetBoolean(omnibox::kKeywordSpaceTriggeringEnabled);
|
||||
}
|
||||
|
||||
@@ -908,7 +908,7 @@
|
||||
bool OmniboxEditModel::ShouldAcceptKeywordAfterInsertingSpaceAtEnd(
|
||||
const std::u16string& new_text) {
|
||||
// Check if the user has disabled space triggering.
|
||||
@@ -2904,16 +2945,20 @@ bool OmniboxEditModel::ShouldAcceptKeywo
|
||||
@@ -2891,16 +2932,20 @@ bool OmniboxEditModel::ShouldAcceptKeywo
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/about_flags.cc
|
||||
+++ b/chrome/browser/about_flags.cc
|
||||
@@ -12935,11 +12935,338 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -12943,11 +12943,338 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
// AboutFlagsHistogramTest unit test to verify this process).
|
||||
};
|
||||
|
||||
@@ -340,7 +340,7 @@
|
||||
FlagsStateSingleton(const FlagsStateSingleton&) = delete;
|
||||
FlagsStateSingleton& operator=(const FlagsStateSingleton&) = delete;
|
||||
~FlagsStateSingleton() override = default;
|
||||
@@ -12958,7 +13285,7 @@ class FlagsStateSingleton : public flags
|
||||
@@ -12966,7 +13293,7 @@ class FlagsStateSingleton : public flags
|
||||
|
||||
void RestoreDefaultState() {
|
||||
flags_state_ =
|
||||
@@ -349,7 +349,7 @@
|
||||
}
|
||||
|
||||
private:
|
||||
@@ -13295,7 +13622,7 @@ base::span<const FeatureEntry> GetFeatur
|
||||
@@ -13303,7 +13630,7 @@ base::span<const FeatureEntry> GetFeatur
|
||||
!entries_for_testing->empty()) {
|
||||
return *entries_for_testing;
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
#endif // USE_AURA
|
||||
|
||||
#if defined(USE_AURA)
|
||||
@@ -4669,11 +4669,13 @@ const FeatureEntry::FeatureVariation
|
||||
@@ -4672,11 +4672,13 @@ const FeatureEntry::FeatureVariation
|
||||
// calculate and verify checksum.
|
||||
//
|
||||
// When adding a new choice, add it to the end of the list.
|
||||
|
||||
@@ -1006,7 +1006,7 @@
|
||||
}
|
||||
--- a/content/browser/renderer_host/navigation_request.h
|
||||
+++ b/content/browser/renderer_host/navigation_request.h
|
||||
@@ -1477,6 +1477,16 @@ class CONTENT_EXPORT NavigationRequest
|
||||
@@ -1478,6 +1478,16 @@ class CONTENT_EXPORT NavigationRequest
|
||||
|
||||
bool is_ad_tagged() const { return is_ad_tagged_; }
|
||||
|
||||
@@ -1023,7 +1023,7 @@
|
||||
// Called when the browser process is about to process beforeunload handlers
|
||||
// for this navigation, including sending an IPC to the renderer process to
|
||||
// run beforeunload handlers when necessary.
|
||||
@@ -3472,6 +3482,10 @@ class CONTENT_EXPORT NavigationRequest
|
||||
@@ -3468,6 +3478,10 @@ class CONTENT_EXPORT NavigationRequest
|
||||
blink::mojom::ConfidenceLevel confidence_level_ =
|
||||
blink::mojom::ConfidenceLevel::kHigh;
|
||||
|
||||
@@ -1076,7 +1076,7 @@
|
||||
std::optional<SkColor> main_document_theme_color_;
|
||||
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
@@ -12515,6 +12515,22 @@ void RenderFrameHostImpl::CommitNavigati
|
||||
@@ -12522,6 +12522,22 @@ void RenderFrameHostImpl::CommitNavigati
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1099,7 +1099,7 @@
|
||||
bool is_srcdoc = common_params->url.IsAboutSrcdoc();
|
||||
if (is_srcdoc) {
|
||||
// TODO(wjmaclean): initialize this in NavigationRequest's constructor
|
||||
@@ -16096,6 +16112,15 @@ bool RenderFrameHostImpl::DidCommitNavig
|
||||
@@ -16103,6 +16119,15 @@ bool RenderFrameHostImpl::DidCommitNavig
|
||||
document_associated_data_->owned_page()->set_last_main_document_source_id(
|
||||
ukm::ConvertToSourceId(navigation_request->GetNavigationId(),
|
||||
ukm::SourceIdType::NAVIGATION_ID));
|
||||
|
||||
@@ -73,7 +73,7 @@
|
||||
# START ios/ section.
|
||||
--- a/chrome/browser/BUILD.gn
|
||||
+++ b/chrome/browser/BUILD.gn
|
||||
@@ -8581,6 +8581,7 @@ static_library("browser_generated_files"
|
||||
@@ -8583,6 +8583,7 @@ static_library("browser_generated_files"
|
||||
"//chrome/browser/v8_compile_hints/proto",
|
||||
"//chrome/browser/web_applications/mojom:mojom_web_apps_enum",
|
||||
"//chrome/common/request_header_integrity:buildflags",
|
||||
|
||||
@@ -96,7 +96,7 @@
|
||||
#endif // COMPONENTS_HELIUM_SERVICES_PREF_NAMES_H_
|
||||
--- a/chrome/browser/BUILD.gn
|
||||
+++ b/chrome/browser/BUILD.gn
|
||||
@@ -8253,6 +8253,8 @@ static_library("browser") {
|
||||
@@ -8255,6 +8255,8 @@ static_library("browser") {
|
||||
deps += [
|
||||
"//components/spellcheck/browser",
|
||||
"//components/spellcheck/common",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/ui/omnibox/omnibox_view.cc
|
||||
+++ b/chrome/browser/ui/omnibox/omnibox_view.cc
|
||||
@@ -137,10 +137,6 @@ ui::ImageModel OmniboxView::GetIcon(int
|
||||
@@ -133,10 +133,6 @@ ui::ImageModel OmniboxView::GetIcon(int
|
||||
return ui::ImageModel::FromImage(icon);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
return gfx::Rect();
|
||||
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
|
||||
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
|
||||
@@ -510,7 +510,6 @@ void LocationBarView::Init() {
|
||||
@@ -514,7 +514,6 @@ void LocationBarView::Init() {
|
||||
params.types_enabled.push_back(PageActionIconType::kIntentPicker);
|
||||
}
|
||||
params.types_enabled.push_back(PageActionIconType::kPwaInstall);
|
||||
|
||||
@@ -81,7 +81,7 @@
|
||||
|
||||
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
|
||||
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
|
||||
@@ -211,10 +211,10 @@ int IncrementalMinimumWidth(const views:
|
||||
@@ -215,10 +215,10 @@ int IncrementalMinimumWidth(const views:
|
||||
}
|
||||
|
||||
// The padding between the intent chip and the other trailing decorations.
|
||||
@@ -94,7 +94,7 @@
|
||||
|
||||
} // namespace
|
||||
|
||||
@@ -260,7 +260,10 @@ LocationBarView::LocationBarView(Browser
|
||||
@@ -264,7 +264,10 @@ LocationBarView::LocationBarView(Browser
|
||||
!v->GetOmniboxController()->IsPopupOpen();
|
||||
}));
|
||||
views::FocusRing::Get(this)->SetOutsetFocusRingDisabled(true);
|
||||
@@ -106,7 +106,7 @@
|
||||
|
||||
#if BUILDFLAG(OS_LEVEL_GEOLOCATION_PERMISSION_SUPPORTED)
|
||||
if (features::IsOsLevelGeolocationPermissionSupportEnabled()) {
|
||||
@@ -319,9 +322,9 @@ void LocationBarView::Init() {
|
||||
@@ -323,9 +326,9 @@ void LocationBarView::Init() {
|
||||
CONTEXT_OMNIBOX_PRIMARY, views::style::STYLE_PRIMARY);
|
||||
|
||||
const gfx::FontList& omnibox_chip_font_list = typography_provider.GetFont(
|
||||
@@ -118,7 +118,7 @@
|
||||
|
||||
auto location_icon_view =
|
||||
std::make_unique<LocationIconView>(omnibox_chip_font_list, this, this);
|
||||
@@ -476,7 +479,7 @@ void LocationBarView::Init() {
|
||||
@@ -480,7 +483,7 @@ void LocationBarView::Init() {
|
||||
// if all page actions (i.e. up to bookmark star) are migrated.
|
||||
const bool should_bridge_containers =
|
||||
!IsPageActionMigrated(PageActionIconType::kBookmarkStar);
|
||||
@@ -127,7 +127,7 @@
|
||||
const page_actions::PageActionViewParams page_action_params{
|
||||
.icon_size =
|
||||
GetLayoutConstant(LayoutConstant::kLocationBarTrailingIconSize),
|
||||
@@ -499,16 +502,10 @@ void LocationBarView::Init() {
|
||||
@@ -503,16 +506,10 @@ void LocationBarView::Init() {
|
||||
// first so that they appear on the left side of the icon container.
|
||||
// TODO(crbug.com/40835681): Improve the ordering heuristics for page action
|
||||
// icons and determine a way to handle simultaneous icon animations.
|
||||
@@ -144,7 +144,7 @@
|
||||
if (!apps::features::ShouldShowLinkCapturingUX()) {
|
||||
params.types_enabled.push_back(PageActionIconType::kIntentPicker);
|
||||
}
|
||||
@@ -518,56 +515,8 @@ void LocationBarView::Init() {
|
||||
@@ -522,56 +519,8 @@ void LocationBarView::Init() {
|
||||
params.types_enabled.push_back(PageActionIconType::kZoom);
|
||||
params.types_enabled.push_back(PageActionIconType::kFileSystemAccess);
|
||||
|
||||
@@ -201,7 +201,7 @@
|
||||
|
||||
if (browser_ && !is_popup_mode_) {
|
||||
params.types_enabled.push_back(PageActionIconType::kBookmarkStar);
|
||||
@@ -584,17 +533,6 @@ void LocationBarView::Init() {
|
||||
@@ -588,17 +537,6 @@ void LocationBarView::Init() {
|
||||
AddChildView(std::make_unique<PageActionIconContainerView>(params));
|
||||
page_action_icon_controller_ = page_action_icon_container_->controller();
|
||||
|
||||
@@ -219,7 +219,7 @@
|
||||
auto clear_all_button = views::CreateVectorImageButton(base::BindRepeating(
|
||||
static_cast<void (OmniboxView::*)(const std::u16string&)>(
|
||||
&OmniboxView::SetUserText),
|
||||
@@ -619,7 +557,7 @@ bool LocationBarView::IsInitialized() co
|
||||
@@ -623,7 +561,7 @@ bool LocationBarView::IsInitialized() co
|
||||
|
||||
int LocationBarView::GetBorderRadius() const {
|
||||
return ChromeLayoutProvider::Get()->GetCornerRadiusMetric(
|
||||
@@ -228,7 +228,7 @@
|
||||
}
|
||||
|
||||
std::unique_ptr<views::Background> LocationBarView::CreateRoundRectBackground(
|
||||
@@ -829,9 +767,9 @@ void LocationBarView::Layout(PassKey) {
|
||||
@@ -833,9 +771,9 @@ void LocationBarView::Layout(PassKey) {
|
||||
// TODO(manukh): Move constants to layout_constants.cc.
|
||||
// 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.
|
||||
@@ -240,7 +240,7 @@
|
||||
|
||||
// Apply indentation to align the omnibox input icon and the text with those
|
||||
// of the suggestions in the popup. However, there are two exceptions where
|
||||
@@ -850,22 +788,22 @@ void LocationBarView::Layout(PassKey) {
|
||||
@@ -854,22 +792,22 @@ void LocationBarView::Layout(PassKey) {
|
||||
!location_icon_view_->ShouldShowLabel() &&
|
||||
!ShouldShowKeywordBubble();
|
||||
if (should_indent) {
|
||||
@@ -267,7 +267,7 @@
|
||||
}
|
||||
|
||||
LocationBarLayout leading_decorations(LocationBarLayout::Position::kLeftEdge,
|
||||
@@ -1504,7 +1442,7 @@ int LocationBarView::GetMinimumTrailingW
|
||||
@@ -1508,7 +1446,7 @@ int LocationBarView::GetMinimumTrailingW
|
||||
}
|
||||
|
||||
gfx::Rect LocationBarView::GetLocalBoundsWithoutEndcaps() const {
|
||||
@@ -276,7 +276,7 @@
|
||||
gfx::Rect bounds_without_endcaps(GetLocalBounds());
|
||||
bounds_without_endcaps.Inset(gfx::Insets::VH(0, border_radius));
|
||||
return bounds_without_endcaps;
|
||||
@@ -1520,9 +1458,9 @@ void LocationBarView::RefreshBackground(
|
||||
@@ -1524,9 +1462,9 @@ void LocationBarView::RefreshBackground(
|
||||
ui::NativeTheme::PreferredContrast::kMore;
|
||||
|
||||
const auto* const color_provider = GetColorProvider();
|
||||
|
||||
@@ -155,7 +155,7 @@
|
||||
// smaller than this bounds; they'll be centered within the bounds.
|
||||
--- a/chrome/browser/ui/views/omnibox/omnibox_popup_view_views.cc
|
||||
+++ b/chrome/browser/ui/views/omnibox/omnibox_popup_view_views.cc
|
||||
@@ -679,14 +679,7 @@ gfx::Rect OmniboxPopupViewViews::GetTarg
|
||||
@@ -694,14 +694,7 @@ gfx::Rect OmniboxPopupViewViews::GetTarg
|
||||
// added if the results section has no height (result set is empty or all
|
||||
// results are hidden). See https://crbug.com/1076646 for additional context.
|
||||
if (popup_height != 0) {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
|
||||
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
|
||||
@@ -511,7 +511,6 @@ void LocationBarView::Init() {
|
||||
@@ -515,7 +515,6 @@ void LocationBarView::Init() {
|
||||
}
|
||||
params.types_enabled.push_back(PageActionIconType::kPwaInstall);
|
||||
params.types_enabled.push_back(PageActionIconType::kTranslate);
|
||||
|
||||
Reference in New Issue
Block a user