From 3c9feb569b73891e3397298fa3fb8a14e95094f8 Mon Sep 17 00:00:00 2001 From: Jay Harris Date: Wed, 23 Jul 2025 17:52:21 +1200 Subject: [PATCH] [Profiles]: Fix profile picker buttons (#30215) --- .../profile_card.html.ts.lit_mangler.ts | 14 ++ ...le_picker_main_view.html.ts.lit_mangler.ts | 14 ++ .../profile_picker/profile_picker_shared.css | 14 ++ ...-profile_picker-profile_card.html.ts.patch | 13 -- ...ker-profile_picker_main_view.html.ts.patch | 21 --- .../__snapshots__/mangle.test.ts.snap | 153 ++++++++++++++++++ .../lit_mangler/lit_mangler_cli.ts | 2 +- 7 files changed, 196 insertions(+), 35 deletions(-) create mode 100644 chromium_src/chrome/browser/resources/signin/profile_picker/profile_card.html.ts.lit_mangler.ts create mode 100644 chromium_src/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.html.ts.lit_mangler.ts create mode 100644 chromium_src/chrome/browser/resources/signin/profile_picker/profile_picker_shared.css delete mode 100644 patches/chrome-browser-resources-signin-profile_picker-profile_card.html.ts.patch delete mode 100644 patches/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.html.ts.patch diff --git a/chromium_src/chrome/browser/resources/signin/profile_picker/profile_card.html.ts.lit_mangler.ts b/chromium_src/chrome/browser/resources/signin/profile_picker/profile_card.html.ts.lit_mangler.ts new file mode 100644 index 00000000000..037e46b1141 --- /dev/null +++ b/chromium_src/chrome/browser/resources/signin/profile_picker/profile_card.html.ts.lit_mangler.ts @@ -0,0 +1,14 @@ +// Copyright (c) 2025 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. + +import { mangle } from 'lit_mangler' + +mangle(fragment => { + const button = fragment.querySelector('#profileCardButton') + if (!button) { + throw new Error('profileCardButton not found') + } + button.classList.add('plain') +}, t => t.text.includes('id="profileCardButton"')) diff --git a/chromium_src/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.html.ts.lit_mangler.ts b/chromium_src/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.html.ts.lit_mangler.ts new file mode 100644 index 00000000000..d66531e1e9d --- /dev/null +++ b/chromium_src/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.html.ts.lit_mangler.ts @@ -0,0 +1,14 @@ +// Copyright (c) 2025 The Brave Authors. All rights reserved. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at https://mozilla.org/MPL/2.0/. + +import { mangle } from 'lit_mangler' + +mangle(fragment => { + const button = fragment.querySelector('#addProfile') + if (!button) { + throw new Error('addProfile not found') + } + button.classList.add('plain') +}, t => t.text.includes('id="addProfile"')) diff --git a/chromium_src/chrome/browser/resources/signin/profile_picker/profile_picker_shared.css b/chromium_src/chrome/browser/resources/signin/profile_picker/profile_picker_shared.css new file mode 100644 index 00000000000..024a61d265e --- /dev/null +++ b/chromium_src/chrome/browser/resources/signin/profile_picker/profile_picker_shared.css @@ -0,0 +1,14 @@ +/* Copyright (c) 2025 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at https://mozilla.org/MPL/2.0/. */ + +/* #css_wrapper_metadata_start + * #type=style-lit + * #import=./profile_picker_shared-chromium.css.js + * #include=profile-picker-shared-chromium + * #css_wrapper_metadata_end */ + +cr-button.plain { + --leo-button-color: transparent; +} diff --git a/patches/chrome-browser-resources-signin-profile_picker-profile_card.html.ts.patch b/patches/chrome-browser-resources-signin-profile_picker-profile_card.html.ts.patch deleted file mode 100644 index caa4b7ce726..00000000000 --- a/patches/chrome-browser-resources-signin-profile_picker-profile_card.html.ts.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/chrome/browser/resources/signin/profile_picker/profile_card.html.ts b/chrome/browser/resources/signin/profile_picker/profile_card.html.ts -index 1aaf591af5d51f3268fdf1413592cb95c3a60066..286c6db5fc27b75e9db2fbe3ebeacbd5f9950cdc 100644 ---- a/chrome/browser/resources/signin/profile_picker/profile_card.html.ts -+++ b/chrome/browser/resources/signin/profile_picker/profile_card.html.ts -@@ -10,7 +10,7 @@ import {isGlicVersion} from './profile_picker_flags.js'; - export function getHtml(this: ProfileCardElement) { - return html` -
-- -
- diff --git a/patches/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.html.ts.patch b/patches/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.html.ts.patch deleted file mode 100644 index 65a158777c1..00000000000 --- a/patches/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.html.ts.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.html.ts b/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.html.ts -index e3b5ead78f763d2394c73ba19b13247d689e3183..24b6abd27004ac1548f3b8ac3b70aaf3af517e30 100644 ---- a/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.html.ts -+++ b/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.html.ts -@@ -31,7 +31,7 @@ ${function() { - data-index="${index}"> - - `)} -- -@@ -46,7 +46,6 @@ ${function() { - -
-- $i18nRaw{glicAddProfileHelper} -
- -
diff --git a/tools/chromium_src/lit_mangler/__snapshots__/mangle.test.ts.snap b/tools/chromium_src/lit_mangler/__snapshots__/mangle.test.ts.snap index 817b8884314..9a80cde43c7 100644 --- a/tools/chromium_src/lit_mangler/__snapshots__/mangle.test.ts.snap +++ b/tools/chromium_src/lit_mangler/__snapshots__/mangle.test.ts.snap @@ -385,6 +385,159 @@ exports[`mangled files should have up to date snapshots ./chromium_src/chrome/br " `; +exports[`mangled files should have up to date snapshots ./chromium_src/chrome/browser/resources/signin/profile_picker/profile_card.html.ts.lit_mangler.ts should match snapshot 1`] = ` +"=================================================================== +--- ../chrome/browser/resources/signin/profile_picker/profile_card.html.ts ++++ gen/chrome/browser/resources/signin/profile_picker/preprocessed/profile_card.html.ts +@@ -5,53 +5,37 @@ + + export function getHtml(this: ProfileCardElement) { + return html\` +
+- ++ +
+ \\"\\" +-
++
+ +
+
+-
++
+ \${this.profileState.gaiaName} +
+-
++
+
$i18n{needsSigninPrompt}
+ +
+ +
+- ++ + +
+
+- ++ + +
+- ++ + \${this.profileState.gaiaName} + +- ++ + \${this.getNameInputTooltipText()} + + \`; + } +" +`; + +exports[`mangled files should have up to date snapshots ./chromium_src/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.html.ts.lit_mangler.ts should match snapshot 1`] = ` +"=================================================================== +--- ../chrome/browser/resources/signin/profile_picker/profile_picker_main_view.html.ts ++++ gen/chrome/browser/resources/signin/profile_picker/preprocessed/profile_picker_main_view.html.ts +@@ -14,49 +14,35 @@ + } + }()} +
+
+- +-

+-
++ ++

++
+
+
+
+ \${this.profilesList_.map((item, index) => html\` + + + \`)} +- +-
++ ++
+ $i18n{addSpaceButton} +
+ + +
+
+- +-
+- $i18nRaw{glicAddProfileHelper} +-
+- ++ +
+
+- ++ + + $i18n{browseAsGuestButton} + +- ++ + $i18n{askOnStartupCheckboxText} + +
+ +@@ -66,15 +52,12 @@ +
+ \${this.forceSigninErrorDialogBody_} +
+
+- ++ + $i18n{ok} + +- ++ + $i18n{needsSigninPrompt} + +
+ +" +`; + exports[`mangled files should have up to date snapshots ./chromium_src/components/webui/chrome_urls/resources/app.html.ts.lit_mangler.ts should match snapshot 1`] = ` "=================================================================== --- ../components/webui/chrome_urls/resources/app.html.ts diff --git a/tools/chromium_src/lit_mangler/lit_mangler_cli.ts b/tools/chromium_src/lit_mangler/lit_mangler_cli.ts index 72df2d40b4f..eac5211cdd3 100644 --- a/tools/chromium_src/lit_mangler/lit_mangler_cli.ts +++ b/tools/chromium_src/lit_mangler/lit_mangler_cli.ts @@ -44,7 +44,7 @@ const runTypecheck = (genDir: string, files: string[]) => { const result = childProcess.spawnSync('tsc', ['-p', getTsConfigForFiles(genDir, files)]) // Note: tsc in Windows doesn't return a status code on success (i.e. status === null). if (result.status ?? 0 !== 0) { - console.error('Typechecking failed:\n', result.stderr?.toString()) + console.error('Typechecking failed:\n', result.stdout?.toString(), result.stderr?.toString()) process.exit(1) } }