mirror of
https://github.com/morgan9e/helium
synced 2026-04-14 00:14:20 +09:00
merge: update to chromium 143.0.7499.146 (#632)
This commit is contained in:
@@ -1 +1 @@
|
||||
143.0.7499.109
|
||||
143.0.7499.146
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/about_flags.cc
|
||||
+++ b/chrome/browser/about_flags.cc
|
||||
@@ -13652,11 +13652,328 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -13667,11 +13667,328 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
// AboutFlagsHistogramTest unit test to verify this process).
|
||||
};
|
||||
|
||||
@@ -330,7 +330,7 @@
|
||||
FlagsStateSingleton(const FlagsStateSingleton&) = delete;
|
||||
FlagsStateSingleton& operator=(const FlagsStateSingleton&) = delete;
|
||||
~FlagsStateSingleton() override = default;
|
||||
@@ -13675,7 +13992,7 @@ class FlagsStateSingleton : public flags
|
||||
@@ -13690,7 +14007,7 @@ class FlagsStateSingleton : public flags
|
||||
|
||||
void RestoreDefaultState() {
|
||||
flags_state_ =
|
||||
@@ -339,7 +339,7 @@
|
||||
}
|
||||
|
||||
private:
|
||||
@@ -13999,7 +14316,7 @@ base::span<const FeatureEntry> GetFeatur
|
||||
@@ -14014,7 +14331,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)
|
||||
@@ -5207,11 +5207,13 @@ const FeatureEntry::FeatureVariation kPr
|
||||
@@ -5222,11 +5222,13 @@ const FeatureEntry::FeatureVariation kPr
|
||||
// calculate and verify checksum.
|
||||
//
|
||||
// When adding a new choice, add it to the end of the list.
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
--- a/build/config/chrome_build.gni
|
||||
+++ b/build/config/chrome_build.gni
|
||||
@@ -101,4 +101,4 @@ declare_args() {
|
||||
@@ -92,4 +92,4 @@ declare_args() {
|
||||
|
||||
# Whether to enable built-in branding assets (logos & marketing snippets) for
|
||||
# search providers in choice UIs.
|
||||
-enable_builtin_search_provider_assets = is_internal_chrome_branded
|
||||
-enable_builtin_search_provider_assets = is_chrome_branded
|
||||
+enable_builtin_search_provider_assets = true
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
padding-top: var(--ntp-one-google-bar-height);
|
||||
--- a/chrome/browser/resources/new_tab_page/app.html
|
||||
+++ b/chrome/browser/resources/new_tab_page/app.html
|
||||
@@ -1,91 +1,4 @@
|
||||
@@ -1,92 +1,4 @@
|
||||
-<!-- #html_wrapper_imports_start
|
||||
-import {nothing} from '//resources/lit/v3_0/lit.rollup.js';
|
||||
-#html_wrapper_imports_end -->
|
||||
@@ -68,7 +68,7 @@
|
||||
- ?ntp-realbox-next-enabled="${this.ntpRealboxNextEnabled_}"
|
||||
- ?cycling-placeholders="${this.searchboxCyclingPlaceholders_}"
|
||||
- @searchbox-input-focus-changed="${this.onInputFocusChanged_}"
|
||||
- ?ntp-next-features-enabled="${this.ntpNextFeaturesEnabled_}">
|
||||
- context-menu-glif-animation-state="${this.contextMenuGlifAnimationState_}">
|
||||
- </cr-searchbox>
|
||||
- ${this.showComposebox_ ? html`
|
||||
- <cr-composebox id="composebox"
|
||||
@@ -88,7 +88,8 @@
|
||||
- ${this.lazyRender_
|
||||
- && this.ntpNextFeaturesEnabled_ && this.isActionChipsVisible_ ? html`
|
||||
- <ntp-action-chips
|
||||
- @action-chip-click="${this.openComposebox_}">
|
||||
- @action-chip-click="${this.openComposebox_}"
|
||||
- @action-chips-retrieval-state-changed="${this.onActionChipsRetrievalStateChanged_}">
|
||||
- </ntp-action-chips>
|
||||
- ` : ''}
|
||||
- ${this.lazyRender_ ? html`
|
||||
@@ -102,7 +103,7 @@
|
||||
${this.lazyRender_ ? html`
|
||||
${this.shortcutsEnabled_ ? html`
|
||||
<cr-most-visited id="mostVisited" .theme="${this.theme_?.mostVisited || null}"
|
||||
@@ -94,54 +7,7 @@ import {nothing} from '//resources/lit/v
|
||||
@@ -95,54 +7,7 @@ import {nothing} from '//resources/lit/v
|
||||
max-tiles-before-show-more="${this.maxTilesBeforeShowMore_}">
|
||||
</cr-most-visited>
|
||||
` : ''}
|
||||
@@ -157,7 +158,7 @@
|
||||
<ntp-customize-buttons id="customizeButtons"
|
||||
?modules-shown-to-user="${this.modulesShownToUser}"
|
||||
?show-background-image="${this.showBackgroundImage_}"
|
||||
@@ -163,23 +29,3 @@ import {nothing} from '//resources/lit/v
|
||||
@@ -164,23 +29,3 @@ import {nothing} from '//resources/lit/v
|
||||
` : ''}
|
||||
<div id="contentBottomSpacer"></div>
|
||||
</div>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/ui/views/omnibox/rounded_omnibox_results_frame.cc
|
||||
+++ b/chrome/browser/ui/views/omnibox/rounded_omnibox_results_frame.cc
|
||||
@@ -43,7 +43,7 @@
|
||||
@@ -42,7 +42,7 @@
|
||||
namespace {
|
||||
|
||||
// Value from the spec controlling appearance of the shadow.
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
#if !defined(USE_AURA)
|
||||
|
||||
@@ -231,8 +231,7 @@ RoundedOmniboxResultsFrame::RoundedOmnib
|
||||
@@ -230,8 +230,7 @@ RoundedOmniboxResultsFrame::RoundedOmnib
|
||||
LocationBarView* location_bar,
|
||||
bool forward_mouse_events)
|
||||
: contents_(contents), forward_mouse_events_(forward_mouse_events) {
|
||||
@@ -19,7 +19,7 @@
|
||||
// Host the contents in its own View to simplify layout and customization.
|
||||
auto contents_host_builder =
|
||||
views::Builder<views::View>()
|
||||
@@ -299,10 +298,10 @@ int RoundedOmniboxResultsFrame::GetNonRe
|
||||
@@ -298,10 +297,10 @@ int RoundedOmniboxResultsFrame::GetNonRe
|
||||
|
||||
// static
|
||||
gfx::Insets RoundedOmniboxResultsFrame::GetLocationBarAlignmentInsets() {
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/BUILD.gn
|
||||
+++ b/BUILD.gn
|
||||
@@ -459,14 +459,6 @@ group("gn_all") {
|
||||
@@ -458,14 +458,6 @@ group("gn_all") {
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/about_flags.cc
|
||||
+++ b/chrome/browser/about_flags.cc
|
||||
@@ -5210,10 +5210,12 @@ const FeatureEntry::FeatureVariation kPr
|
||||
@@ -5225,10 +5225,12 @@ const FeatureEntry::FeatureVariation kPr
|
||||
#include "chrome/browser/ungoogled_flag_choices.h"
|
||||
#include "chrome/browser/bromite_flag_choices.h"
|
||||
#include "chrome/browser/ungoogled_platform_flag_choices.h"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/about_flags.cc
|
||||
+++ b/chrome/browser/about_flags.cc
|
||||
@@ -5206,7 +5206,13 @@ const FeatureEntry::FeatureVariation kPr
|
||||
@@ -5221,7 +5221,13 @@ const FeatureEntry::FeatureVariation kPr
|
||||
// calculate and verify checksum.
|
||||
//
|
||||
// When adding a new choice, add it to the end of the list.
|
||||
|
||||
Reference in New Issue
Block a user