morgan/helium
1
0
Fork 0
mirror of https://github.com/morgan9e/helium synced 2026-04-15 00:44:06 +09:00
Code Issues Packages Projects Releases Wiki Activity
Files
2d603520e2c1aaf8786eea60fde60311587235ca
helium/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch
Blaise 2d603520e2 Update to Chromium 134.0.6998.35
2025-03-03 07:36:20 -06:00

635 lines
30 KiB
Diff
Raw Blame History

# Removes in order:
# 'Learn more' links on the performance page
# more 'Learn more' links on the performance page
# link to Chrome store on the extensions page when empty
# link to Chrome store in extensions page sidebar
# 'Tabs from other devices' entry on the History page sidebar
# the 'Learn more' link on new incognito tabs
# Live captions entry from the settings page
# link to Google's accessibility site from the settings page
# update status icon on the About page
# update status text on the About page
# link to Google's help site on the About page
# external link for theme entry on settings page
# webstore text for theme entry on settings page
# the Google account line from the Payment methods page
# Safety check section on the settings page
# Privacy guide promo on the privacy page
# Google sign-in and Anonymized Data Collection sections
# help bubble for the removed data collection section
# Privacy guide section on the privacy page
# Advanced Protection Program link on the security settings page
# the 'Learn more' link from the search engine entry on the settings page
# Safety Check entry on the side menu on the settings page
# the (?) learn more button on many settings pages
# 'Sign in to see tabs from other devices' in the history submenu
# the 'Vist Chrome Web Store' entry in the extensions section of the main menu
# the side panel entry in All Bookmarks
# the feedback entry in the third party cookie popup
# unneeded elements from the profile menu
# the 'Learn more' link on crashed tabs
# the Third-party sign-in site settings (FedCM)
# non-functional AI options
# disable LiveCaption flag by default, this also removes non-functional Live Caption checkbox from media controls
# the new feature badges
--- a/chrome/app/settings_chromium_strings.grdp
+++ b/chrome/app/settings_chromium_strings.grdp
@@ -370,13 +370,13 @@
<!-- Performance Page -->
<message name="IDS_SETTINGS_PERFORMANCE_MEMORY_SAVER_MODE_SETTING_DESCRIPTION" desc="Description for the memory saver mode setting">
- Chromium frees up memory from inactive tabs. This gives active tabs and other apps more computer resources and keeps Chromium fast. Your inactive tabs automatically become active again when you go back to them. <ph name="BEGIN_LINK">&lt;a href="$1" target="_blank" id="learn-more" aria-description="$2"&gt;</ph>Learn more about Memory Saver<ph name="END_LINK">&lt;/a&gt;</ph>
+ Chromium frees up memory from inactive tabs. This gives active tabs and other apps more computer resources and keeps Chromium fast. Your inactive tabs automatically become active again when you go back to them.
</message>
<message name="IDS_SETTINGS_PERFORMANCE_BATTERY_SAVER_MODE_SETTING_DESCRIPTION" desc="Description for the energy saver mode setting">
- Chromium conserves battery power by limiting background activity and visual effects, such as smooth scrolling and video frame rates. <ph name="BEGIN_LINK">&lt;a href="$1" target="_blank" id="learn-more" aria-description="$2"&gt;</ph>Learn more about Energy Saver<ph name="END_LINK">&lt;/a&gt;</ph>
+ Chromium conserves battery power by limiting background activity and visual effects, such as smooth scrolling and video frame rates.
</message>
<message name="IDS_SETTINGS_PERFORMANCE_PRELOAD_TOGGLE_SUMMARY" desc="Summary for the preload pages setting">
- Chromium preloads pages which makes browsing and searching faster. <ph name="BEGIN_LINK">&lt;a href="$1" target="_blank" id="learn-more" aria-description="$2"&gt;</ph>Learn more about preload pages<ph name="END_LINK">&lt;/a&gt;</ph>
+ Chromium preloads pages which makes browsing and searching faster.
</message>
<!-- Languages Page -->
--- a/chrome/app/settings_strings.grdp
+++ b/chrome/app/settings_strings.grdp
@@ -1186,7 +1186,7 @@
Active site
</message>
<message name="IDS_SETTINGS_PERFORMANCE_TAB_DISCARDING_EXCEPTIONS_ADD_DIALOG_HELP" desc="Help text shown on the second tab of the tab discarding exception list add dialog. Explains how to use the filter format to add an exclusion rule to the list.">
- Sites you add will always stay active and memory won't be freed up from them. <ph name="BEGIN_LINK">&lt;a href="$1" target="_blank"&gt;</ph>Learn more about keeping specific sites active<ph name="END_LINK">&lt;/a&gt;</ph>
+ Sites you add will always stay active and memory won't be freed up from them.
</message>
<message name="IDS_SETTINGS_PERFORMANCE_BATTERY_PAGE_TITLE" desc="Title of the power section in the performance settings page.">
Power
@@ -1210,7 +1210,7 @@
Inactive tabs appearance
</message>
<message name="IDS_SETTINGS_PERFORMANCE_DISCARD_RING_TREATMENT_ENABLED_DESCRIPTION_WITH_LEARN_LINK" desc="Label for a performance settings toggle description that controls whether the inactive tab UI is shown. Also contains a link to the help center article.">
- A dotted circle appears around site icons. <ph name="BEGIN_LINK">&lt;a href="$1" target="_blank" aria-description="$2"&gt;</ph>Learn more about inactive tabs<ph name="END_LINK">&lt;/a&gt;</ph>
+ A dotted circle appears around site icons.
</message>
<message name="IDS_SETTINGS_PERFORMANCE_TAB_HOVER_PREVIEW_CARD_LINK_TITLE" desc="Title for the link row that points to tab hover preview card apperance settings.">
Tab hover preview card appearance
@@ -1222,7 +1222,7 @@
Performance issue alerts
</message>
<message name="IDS_SETTINGS_PERFORMANCE_INTERVENTION_NOTIFICATION_ENABLED_DESCRIPTION" desc="Label for a performance settings toggle that controls whether performance intervention notifications should be shown and link to learn more about performance issue alerts.">
- Get notifications that suggest ways to improve detected performance issues. <ph name="BEGIN_LINK">&lt;a href="$1" target="_blank" aria-description="$2"&gt;</ph>Learn more about performance issue alerts<ph name="END_LINK">&lt;/a&gt;</ph>
+ Get notifications that suggest ways to improve detected performance issues.
</message>
<!-- Languages Page -->
--- a/chrome/browser/resources/extensions/item_list.html.ts
+++ b/chrome/browser/resources/extensions/item_list.html.ts
@@ -30,12 +30,6 @@ export function getHtml(this: Extensions
</extensions-mv2-deprecation-panel>
</div>` : ''}
- <div id="no-items" class="empty-list-message"
- ?hidden="${!this.shouldShowEmptyItemsMessage_()}">
- <span @click="${this.onNoExtensionsClick_}">
- $i18nRaw{noExtensionsOrApps}
- </span>
- </div>
<div id="no-search-results" class="empty-list-message"
?hidden="${!this.shouldShowEmptySearchMessage_()}">
<span>$i18n{noSearchResults}</span>
--- a/chrome/browser/resources/extensions/sidebar.html.ts
+++ b/chrome/browser/resources/extensions/sidebar.html.ts
@@ -33,16 +33,6 @@ export function getHtml(this: Extensions
<cr-ripple></cr-ripple>
</a>
</cr-menu-selector>
-<div class="separator"></div>
-<div class="cr-nav-menu-item" id="moreExtensions">
- <cr-icon id="web-store-icon" icon="extensions-icons:web_store">
- </cr-icon>
- <span id="discover-more-text" class="cr-secondary-text"
- @click="${this.onMoreExtensionsClick_}"
- .innerHTML="${this.computeDiscoverMoreText_()}">
- </span>
- <cr-ripple></cr-ripple>
-</div>
<!--_html_template_end_-->`;
// clang-format on
}
--- a/chrome/browser/resources/extensions/sidebar.ts
+++ b/chrome/browser/resources/extensions/sidebar.ts
@@ -8,7 +8,6 @@ import './icons.html.js';
import type {CrMenuSelector} from 'chrome://resources/cr_elements/cr_menu_selector/cr_menu_selector.js';
import {I18nMixinLit} from 'chrome://resources/cr_elements/i18n_mixin_lit.js';
import {assert} from 'chrome://resources/js/assert.js';
-import {loadTimeData} from 'chrome://resources/js/load_time_data.js';
import {CrLitElement} from 'chrome://resources/lit/v3_0/lit.rollup.js';
import type {PropertyValues} from 'chrome://resources/lit/v3_0/lit.rollup.js';
@@ -111,13 +110,6 @@ export class ExtensionsSidebarElement ex
}
}
- protected computeDiscoverMoreText_(): TrustedHTML {
- return this.i18nAdvanced('sidebarDiscoverMore', {
- tags: ['a'],
- attrs: ['target'],
- substitutions: [loadTimeData.getString('getMoreExtensionsUrl')],
- });
- }
}
declare global {
--- a/chrome/browser/resources/history/side_bar.html
+++ b/chrome/browser/resources/history/side_bar.html
@@ -88,13 +88,6 @@
$i18n{historyMenuItem}
<cr-ripple></cr-ripple>
</a>
- <a id="syncedTabs" role="menuitem" href="/syncedTabs"
- class="page-item cr-nav-menu-item"
- path="syncedTabs" on-click="onItemClick_">
- <cr-icon icon="cr:phonelink"></cr-icon>
- $i18n{openTabsMenuItem}
- <cr-ripple></cr-ripple>
- </a>
<template is="dom-if" if="[[compareHistoryEnabled_]]">
<a id="productSpecificationsLists" role="menuitem"
href="/comparisonTables"
--- a/chrome/browser/resources/new_tab_page_incognito_guest/incognito_tab.html
+++ b/chrome/browser/resources/new_tab_page_incognito_guest/incognito_tab.html
@@ -24,9 +24,6 @@ document.querySelector('#incognitothemec
<h1>$i18n{incognitoTabHeading}</h1>
<p id="subtitle">
<span>$i18n{incognitoTabDescription}</span>
- <a class="learn-more-button"
- href="$i18n{learnMoreLink}"
- aria-label="$i18nPolymer{learnMoreA11yLabel}">$i18n{learnMore}</a>
</p>
<div id="bulletpoints-wrapper">
<div class="bulletpoints first">$i18nRaw{incognitoTabFeatures}</div>
--- a/chrome/browser/resources/settings/a11y_page/a11y_page.html
+++ b/chrome/browser/resources/settings/a11y_page/a11y_page.html
@@ -26,7 +26,7 @@
external$="[[captionSettingsOpensExternally_]]">
</cr-link-row>
</template>
- <template is="dom-if" if="[[!captionSettingsOpensExternally_]]">
+ <template is="dom-if" if="[[false]]">
<cr-link-row id="captions"
class="hr"
label="$i18n{captionsTitle}"
@@ -85,11 +85,6 @@
external>
</cr-link-row>
</if>
- <cr-link-row class="hr" label="$i18n{moreFeaturesLink}"
- on-click="onMoreFeaturesLinkClick_" sub-label="$i18n{a11yWebStore}"
- button-aria-description="$i18n{opensInNewTab}"
- external>
- </cr-link-row>
</div>
<if expr="not is_chromeos">
<template is="dom-if" if="[[!captionSettingsOpensExternally_]]">
--- a/chrome/browser/resources/settings/about_page/about_page.html
+++ b/chrome/browser/resources/settings/about_page/about_page.html
@@ -57,7 +57,7 @@
<div class="cr-row two-line">
<!-- Set the icon from the iconset (when it's obsolete/EOL and
when update is done) or set the src (when it's updating). -->
-<if expr="not chromeos_ash">
+<if expr="False">
<div class="icon-container"
hidden="[[!shouldShowIcons_(showUpdateStatus_)]]">
<cr-icon
@@ -72,7 +72,7 @@
</div>
</if>
<div class="flex cr-padded-text">
-<if expr="not chromeos_ash">
+<if expr="False">
<div id="updateStatusMessage" hidden="[[!showUpdateStatus_]]">
<div role="alert" aria-live="polite"
inner-h-t-m-l="[[getUpdateStatusMessage_(
@@ -128,9 +128,6 @@
</div>
</template>
</if>
- <cr-link-row class="hr" id="help" on-click="onHelpClick_"
- label="$i18n{aboutGetHelpUsingChrome}"
- external></cr-link-row>
<if expr="_google_chrome">
<cr-link-row class="hr" id="reportIssue" on-click="onReportIssueClick_"
hidden="[[!prefs.feedback_allowed.value]]"
--- a/chrome/browser/resources/settings/appearance_page/appearance_page.html
+++ b/chrome/browser/resources/settings/appearance_page/appearance_page.html
@@ -41,12 +41,11 @@
<settings-animated-pages id="pages" section="appearance"
focus-config="[[focusConfig_]]">
<div route-path="default">
- <div class="settings-row first" id="themeRow"
+ <div class="cr-row first" id="themeRow"
hidden="[[!pageVisibility.setTheme]]">
- <cr-link-row id="openTheme" class="first"
- hidden="[[!pageVisibility.setTheme]]"
- label="$i18n{themes}" sub-label="[[themeSublabel_]]"
- on-click="onThemeClick_" external></cr-link-row>
+ <div class="flex cr-padded-text">
+ <div>$i18n{themes}</div><div class="secondary">[[themeSublabel_]]</div>
+ </div>
<if expr="not is_linux">
<template is="dom-if" if="[[prefs.extensions.theme.id.value]]">
<div class="separator"></div>
--- a/chrome/browser/resources/settings/appearance_page/appearance_page.ts
+++ b/chrome/browser/resources/settings/appearance_page/appearance_page.ts
@@ -503,15 +503,11 @@ export class SettingsAppearancePageEleme
i18nId = 'classicTheme';
break;
}
+ this.themeSublabel_ = this.i18n(i18nId);
// </if>
// <if expr="not is_linux">
- if (this.toolbarPinningEnabled_) {
this.themeSublabel_ = '';
- return;
- }
- i18nId = 'chooseFromWebStore';
// </if>
- this.themeSublabel_ = this.i18n(i18nId);
}
/** @return Whether applied theme is set by policy. */
--- a/chrome/browser/resources/settings/autofill_page/payments_section.html
+++ b/chrome/browser/resources/settings/autofill_page/payments_section.html
@@ -80,11 +80,6 @@
</div>
</template>
-<div id="manageLink" class="cr-row first">
- <!-- This span lays out the link correctly, relative to the text. -->
- <div class="cr-padded-text">$i18nRaw{manageCreditCardsLabel}</div>
-</div>
-
<div class="cr-row continuation">
<h2 class="flex">$i18n{creditCards}</h2>
<template is="dom-if"
--- a/chrome/browser/resources/settings/basic_page/basic_page.html
+++ b/chrome/browser/resources/settings/basic_page/basic_page.html
@@ -70,7 +70,7 @@
<!-- TODO(crbug.com/40267370): Add a test to basic_page_test.ts
to check that settings-safety-hub-entry-point is not visible
in the guest mode. -->
- <template is="dom-if" if="[[showPage_(pageVisibility.safetyHub)]]"
+ <template is="dom-if" if="[[false]]"
restamp>
<settings-section page-title="$i18n{safetyHub}"
section="safetyHubEntryPoint" nest-under-section="privacy"
--- a/chrome/browser/resources/settings/basic_page/basic_page.ts
+++ b/chrome/browser/resources/settings/basic_page/basic_page.ts
@@ -13,7 +13,6 @@ import 'chrome://resources/cr_elements/c
import 'chrome://resources/cr_elements/cr_shared_vars.css.js';
import '../ai_page/ai_page.js';
import '../appearance_page/appearance_page.js';
-import '../privacy_page/privacy_guide/privacy_guide_promo.js';
import '../privacy_page/privacy_page.js';
import '../safety_hub/safety_hub_entry_point.js';
import '../autofill_page/autofill_page.js';
@@ -274,7 +273,6 @@ export class SettingsBasicPageElement ex
this.showPrivacyGuidePromo_ = false;
return;
}
- this.showPrivacyGuidePromo_ = true;
if (!this.privacyGuidePromoWasShown_) {
this.privacyGuideBrowserProxy_.incrementPromoImpressionCount();
this.privacyGuidePromoWasShown_ = true;
--- a/chrome/browser/resources/settings/privacy_page/personalization_options.html
+++ b/chrome/browser/resources/settings/privacy_page/personalization_options.html
@@ -24,7 +24,7 @@
</style>
-<if expr="not is_chromeos">
+<if expr="False">
<div id="chromeSigninUserChoiceSetting" class="hr cr-row" role="group"
hidden="[[!chromeSigninUserChoiceInfo_.shouldShowSettings]]"
aria-label="$i18n{chromeSigninChoiceTitle}">
@@ -90,12 +90,6 @@
</settings-toggle-button>
</if><!-- not chromeos -->
</if><!-- _google_chrome -->
- <settings-toggle-button id="urlCollectionToggle"
- class="hr"
- pref="{{prefs.url_keyed_anonymized_data_collection.enabled}}"
- label="$i18n{urlKeyedAnonymizedDataCollection}"
- sub-label="$i18n{urlKeyedAnonymizedDataCollectionDesc}">
- </settings-toggle-button>
<template is="dom-if" if="[[shouldShowHistorySearchControl_(
showHistorySearchControl_, enableAiSettingsPageRefresh_)]]" restamp>
<cr-link-row id="historySearchRow"
--- a/chrome/browser/resources/settings/privacy_page/personalization_options.ts
+++ b/chrome/browser/resources/settings/privacy_page/personalization_options.ts
@@ -206,10 +206,6 @@ export class SettingsPersonalizationOpti
'chrome-signin-user-choice-info-change',
this.setChromeSigninUserChoiceInfo_.bind(this));
// </if>
-
- this.registerHelpBubble(
- ANONYMIZED_URL_COLLECTION_ID,
- this.$.urlCollectionToggle.getBubbleAnchor(), {anchorPaddingTop: 10});
}
// <if expr="chromeos_ash">
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
@@ -41,15 +41,6 @@
label="$i18n{clearBrowsingData}"
sub-label="$i18n{clearBrowsingDataDescription}"
on-click="onClearBrowsingDataClick_"></cr-link-row>
- <template is="dom-if" if="[[isPrivacyGuideAvailable]]">
- <cr-link-row id="privacyGuideLinkRow" class="hr"
- start-icon="privacy20:signpost"
- label="$i18n{privacyGuideLabel}"
- sub-label="$i18n{privacyGuideSublabel}"
- on-click="onPrivacyGuideClick_"
- role-description="$i18n{subpageArrowRoleDescription}">
- </cr-link-row>
- </template>
<cr-link-row id="thirdPartyCookiesLinkRow"
start-icon="privacy:cookie"
class="hr" label="$i18n{thirdPartyCookiesLinkRowLabel}"
--- a/chrome/browser/resources/settings/privacy_page/security_page.html
+++ b/chrome/browser/resources/settings/privacy_page/security_page.html
@@ -237,9 +237,3 @@
</cr-link-row>
</if>
- <cr-link-row id="advanced-protection-program-link" class="hr"
- label="$i18n{advancedProtectionProgramTitle}"
- sub-label="$i18n{advancedProtectionProgramDesc}"
- on-click="onAdvancedProtectionProgramLinkClick_"
- external>
- </cr-link-row>
--- a/chrome/browser/resources/settings/search_page/search_page.html
+++ b/chrome/browser/resources/settings/search_page/search_page.html
@@ -43,11 +43,6 @@
$i18n{searchPageTitle}
<div class="secondary">
$i18n{searchEngineChoiceEntryPointSubtitle}
- <a href="$i18n{searchExplanationLearnMoreURL}"
- aria-label="$i18n{searchExplanationLearnMoreA11yLabel}"
- target="_blank">
- $i18n{learnMore}
- </a>
</div>
<template is="dom-if" if="[[isDefaultSearchControlledByPolicy_(
prefs.default_search_provider_data.template_url_data)]]">
--- a/chrome/browser/resources/settings/settings_page/settings_subpage.html
+++ b/chrome/browser/resources/settings/settings_page/settings_subpage.html
@@ -86,7 +86,7 @@
</template>
<h1 class="cr-title-text">[[pageTitle]]</h1>
<slot name="subpage-title-extra"></slot>
- <template is="dom-if" if="[[learnMoreUrl]]">
+ <template is="dom-if" if="[[false]]">
<cr-icon-button iron-icon="cr:help-outline" suppress-rtl-flip
aria-label="[[getLearnMoreAriaLabel_(pageTitle)]]"
aria-description="$i18n{opensInNewTab}" on-click="onHelpClick_">
--- a/chrome/browser/ui/tabs/recent_tabs_sub_menu_model.cc
+++ b/chrome/browser/ui/tabs/recent_tabs_sub_menu_model.cc
@@ -367,7 +367,6 @@ void RecentTabsSubMenuModel::Build() {
AddSeparator(ui::NORMAL_SEPARATOR);
history_separator_index_ = GetItemCount() - 1;
BuildLocalEntries();
- BuildTabsFromOtherDevices();
}
void RecentTabsSubMenuModel::BuildLocalEntries() {
--- a/chrome/browser/ui/toolbar/app_menu_model.cc
+++ b/chrome/browser/ui/toolbar/app_menu_model.cc
@@ -963,16 +963,6 @@ void ExtensionsMenuModel::Build(Browser*
SetElementIdentifierAt(
GetIndexOfCommandId(IDC_EXTENSIONS_SUBMENU_MANAGE_EXTENSIONS).value(),
kManageExtensionsMenuItem);
- AddItemWithStringId(IDC_EXTENSIONS_SUBMENU_VISIT_CHROME_WEB_STORE,
- IDS_EXTENSIONS_SUBMENU_CHROME_WEBSTORE_ITEM);
- SetElementIdentifierAt(
- GetIndexOfCommandId(IDC_EXTENSIONS_SUBMENU_VISIT_CHROME_WEB_STORE)
- .value(),
- kVisitChromeWebStoreMenuItem);
-#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
- SetCommandIcon(this, IDC_EXTENSIONS_SUBMENU_VISIT_CHROME_WEB_STORE,
- vector_icons::kGoogleChromeWebstoreIcon);
-#endif
}
////////////////////////////////////////////////////////////////////////////////
--- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
@@ -1206,15 +1206,4 @@ void BookmarkMenuDelegate::BuildOtherNod
ui::ImageModel bookmarks_side_panel_icon = ui::ImageModel::FromVectorIcon(
kBookmarksSidePanelIcon, ui::kColorMenuIcon,
ui::SimpleMenuModel::kDefaultIconSize);
- menu->AppendMenuItem(
- IDC_SHOW_BOOKMARK_SIDE_PANEL,
- l10n_util::GetStringUTF16(IDS_BOOKMARKS_ALL_BOOKMARKS_OPEN_SIDE_PANEL),
- bookmarks_side_panel_icon);
- bool other_folder_children_count =
- GetBookmarkMergedSurfaceService()->GetChildrenCount(
- BookmarkParentFolder::OtherFolder());
- if (other_folder_children_count) {
- menu->AppendSeparator();
- other_node_menu_separator_ = menu->GetSubmenu()->children().back().get();
- }
}
--- a/chrome/browser/ui/views/location_bar/cookie_controls/cookie_controls_content_view.cc
+++ b/chrome/browser/ui/views/location_bar/cookie_controls/cookie_controls_content_view.cc
@@ -213,14 +213,7 @@ void CookieControlsContentView::SetEnfor
}
void CookieControlsContentView::SetFeedbackSectionVisibility(bool visible) {
- if (visible && base::FeatureList::IsEnabled(
- content_settings::features::kUserBypassFeedback)) {
- feedback_section_->SetVisible(true);
- // Ensure that the feedback row is always below ACT feature rows.
- ReorderChildView(feedback_section_, children().size());
- } else {
feedback_section_->SetVisible(false);
- }
}
void CookieControlsContentView::AddDescriptionRow() {
--- a/chrome/browser/ui/views/profiles/profile_menu_view.cc
+++ b/chrome/browser/ui/views/profiles/profile_menu_view.cc
@@ -230,6 +230,7 @@ void ProfileMenuView::BuildMenu() {
}
gfx::ImageSkia ProfileMenuView::GetSyncIcon() const {
+ return gfx::ImageSkia();
Profile* profile = browser()->profile();
if (profile->IsOffTheRecord() || profile->IsGuestSession()) {
return gfx::ImageSkia();
@@ -668,16 +669,8 @@ void ProfileMenuView::BuildIdentity() {
badge_image_model, menu_title_, menu_subtitle_, management_label);
} else {
std::string profile_user_display_name, profile_user_email;
-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
- profile_user_display_name = profile->GetPrefs()->GetString(
- enterprise_signin::prefs::kProfileUserDisplayName);
- profile_user_email = profile->GetPrefs()->GetString(
- enterprise_signin::prefs::kProfileUserEmail);
-#endif
menu_title_ =
- profile_user_display_name.empty()
- ? l10n_util::GetStringUTF16(IDS_PROFILES_LOCAL_PROFILE_STATE)
- : base::UTF8ToUTF16(profile_user_display_name);
+ base::UTF8ToUTF16(profile_user_display_name);
// The email may be empty.
menu_subtitle_ = base::UTF8ToUTF16(
profile_user_email.empty() ? account_info.email : profile_user_email);
--- a/chrome/browser/ui/views/sad_tab_view.cc
+++ b/chrome/browser/ui/views/sad_tab_view.cc
@@ -574,9 +574,6 @@ SadTabView::SadTabView(content::WebConte
// There is currently no good way to handle kEnd alignment for a single
// element.
actions_container->SetLayoutManagerUseConstrainedSpace(false);
-
- EnableHelpLink(actions_container);
-
action_button_ =
actions_container->AddChildView(std::make_unique<views::MdTextButton>(
base::BindRepeating(&SadTabView::PerformAction,
@@ -673,22 +670,6 @@ void SadTabView::AttachToWebView() {
}
}
-void SadTabView::EnableHelpLink(views::FlexLayoutView* actions_container) {
-#if BUILDFLAG(IS_CHROMEOS)
- // Do not show the help link in the kiosk session to prevent escape from a
- // kiosk app.
- if (chromeos::IsKioskSession()) {
- return;
- }
-#endif
- auto* help_link =
- actions_container->AddChildView(std::make_unique<views::Link>(
- l10n_util::GetStringUTF16(GetHelpLinkTitle())));
- help_link->SetCallback(base::BindRepeating(
- &SadTab::PerformAction, base::Unretained(this), Action::HELP_LINK));
- help_link->SetProperty(views::kTableVertAlignKey,
- views::LayoutAlignment::kCenter);
-}
void SadTabView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
// Specify the maximum message and title width explicitly.
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -932,40 +932,20 @@ void AddPerformanceStrings(content::WebU
IDS_SETTINGS_PERFORMANCE_TAB_HOVER_PREVIEW_CARD_LINK_SUBTITLE},
{"performanceInterventionEnabledLabel",
IDS_SETTINGS_PERFORMANCE_INTERVENTION_NOTIFICATION_ENABLED_LABEL},
- };
- html_source->AddLocalizedStrings(kLocalizedStrings);
-
- static constexpr struct {
- const char* id;
- int message_id;
- const char16_t* url;
- } kLearnMoreStrings[] = {
{"batterySaverModeDescription",
- IDS_SETTINGS_PERFORMANCE_BATTERY_SAVER_MODE_SETTING_DESCRIPTION,
- chrome::kBatterySaverModeLearnMoreUrl},
+ IDS_SETTINGS_PERFORMANCE_BATTERY_SAVER_MODE_SETTING_DESCRIPTION},
{"discardRingTreatmentEnabledDescriptionWithLearnLink",
- IDS_SETTINGS_PERFORMANCE_DISCARD_RING_TREATMENT_ENABLED_DESCRIPTION_WITH_LEARN_LINK,
- chrome::kDiscardRingTreatmentLearnMoreUrl},
+ IDS_SETTINGS_PERFORMANCE_DISCARD_RING_TREATMENT_ENABLED_DESCRIPTION_WITH_LEARN_LINK},
{"memorySaverModeDescription",
- IDS_SETTINGS_PERFORMANCE_MEMORY_SAVER_MODE_SETTING_DESCRIPTION,
- chrome::kMemorySaverModeLearnMoreUrl},
+ IDS_SETTINGS_PERFORMANCE_MEMORY_SAVER_MODE_SETTING_DESCRIPTION},
{"performanceInterventionEnabledDescription",
- IDS_SETTINGS_PERFORMANCE_INTERVENTION_NOTIFICATION_ENABLED_DESCRIPTION,
- chrome::kPerformanceInterventionLearnMoreUrl},
+ IDS_SETTINGS_PERFORMANCE_INTERVENTION_NOTIFICATION_ENABLED_DESCRIPTION},
{"preloadingToggleSummary",
- IDS_SETTINGS_PERFORMANCE_PRELOAD_TOGGLE_SUMMARY,
- chrome::kPreloadingLearnMoreUrl}};
-
- const std::u16string settings_opens_in_new_tab =
- l10n_util::GetStringUTF16(IDS_SETTINGS_OPENS_IN_NEW_TAB);
-
- for (const auto& learn_more_string : kLearnMoreStrings) {
- html_source->AddString(
- learn_more_string.id,
- l10n_util::GetStringFUTF16(learn_more_string.message_id,
- learn_more_string.url,
- settings_opens_in_new_tab));
- }
+ IDS_SETTINGS_PERFORMANCE_PRELOAD_TOGGLE_SUMMARY},
+ {"tabDiscardingExceptionsAddDialogHelp",
+ IDS_SETTINGS_PERFORMANCE_TAB_DISCARDING_EXCEPTIONS_ADD_DIALOG_HELP},
+ };
+ html_source->AddLocalizedStrings(kLocalizedStrings);
html_source->AddString(
"tabDiscardTimerFiveMinutes",
@@ -1011,11 +991,6 @@ void AddPerformanceStrings(content::WebU
base::NumberToString16(
performance_manager::user_tuning::BatterySaverModeManager::
kLowBatteryThresholdPercent)));
- html_source->AddString(
- "tabDiscardingExceptionsAddDialogHelp",
- l10n_util::GetStringFUTF16(
- IDS_SETTINGS_PERFORMANCE_TAB_DISCARDING_EXCEPTIONS_ADD_DIALOG_HELP,
- chrome::kMemorySaverModeTabDiscardingHelpUrl));
html_source->AddString("discardRingTreatmentLearnMoreUrl",
chrome::kDiscardRingTreatmentLearnMoreUrl);
@@ -3453,7 +3428,7 @@ void AddSiteSettingsStrings(content::Web
base::FeatureList::IsEnabled(blink::features::kWebPrinting));
html_source->AddBoolean("enableFederatedIdentityApiContentSetting",
- base::FeatureList::IsEnabled(features::kFedCm));
+ false);
base::CommandLine& cmd = *base::CommandLine::ForCurrentProcess();
html_source->AddBoolean(
--- a/chrome/browser/ui/webui/settings/settings_ui.cc
+++ b/chrome/browser/ui/webui/settings/settings_ui.cc
@@ -623,13 +623,7 @@ SettingsUI::SettingsUI(content::WebUI* w
auto* optimization_guide_service =
OptimizationGuideKeyedServiceFactory::GetForProfile(profile);
for (auto [key, name] : optimization_guide_features) {
- const bool visible = optimization_guide_service &&
- optimization_guide_service->IsSettingVisible(key);
- html_source->AddBoolean(name, visible);
-
- // The main toggle is visible only if at least one of the sub toggles is
- // visible.
- is_any_ai_feature_enabled |= visible;
+ html_source->AddBoolean(name, false);
}
html_source->AddBoolean("showAdvancedFeaturesMainControl",
--- a/media/base/media_switches.cc
+++ b/media/base/media_switches.cc
@@ -854,7 +854,7 @@ BASE_FEATURE(kOnDeviceWebSpeech,
base::FEATURE_DISABLED_BY_DEFAULT);
// Enables the Live Caption feature on supported devices.
-BASE_FEATURE(kLiveCaption, "LiveCaption", base::FEATURE_ENABLED_BY_DEFAULT);
+BASE_FEATURE(kLiveCaption, "LiveCaption", base::FEATURE_DISABLED_BY_DEFAULT);
// Controls whether a "Share this tab instead" button should be shown for
// getDisplayMedia captures. Note: This flag does not control if the "Share this
--- a/ui/views/controls/menu/menu_item_view.cc
+++ b/ui/views/controls/menu/menu_item_view.cc
@@ -868,7 +868,7 @@ void MenuItemView::SetAlerted() {
}
bool MenuItemView::ShouldShowNewBadge() const {
- return is_new_;
+ return false;
}
bool MenuItemView::IsTraversableByKeyboard() const {
Reference in New Issue View Git Blame Copy Permalink