Upgrade jest to 30.3.0 (#35584)
* Upgrade jest to 30.3.0 Remove use of https://github.com/brave/jest # Conflicts: # package-lock.json * more improvements that can be made with jest upgrade * format
This commit is contained in:
@@ -1,66 +0,0 @@
|
||||
// Copyright (c) 2021 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/.
|
||||
|
||||
const assert = require('assert')
|
||||
const JSDOMEnvironment = require('jest-environment-jsdom').TestEnvironment
|
||||
const webcrypto = require('crypto').webcrypto
|
||||
|
||||
module.exports = class CustomEnvironment extends JSDOMEnvironment {
|
||||
async setup() {
|
||||
await super.setup()
|
||||
|
||||
// Treat JSDOM errors as hard failures. These errors usually occur due to
|
||||
// unimplemented APIs, so it is better to detect those and explicitly mock.
|
||||
assert(this.dom.virtualConsole.listenerCount('jsdomError') === 1)
|
||||
this.dom.virtualConsole.removeAllListeners('jsdomError')
|
||||
this.dom.virtualConsole.addListener('jsdomError', (e) => {
|
||||
// We use @container queries in Nala but they cause an error in jsdom so
|
||||
// until https://github.com/jsdom/jsdom/issues/3597 is resolved, we
|
||||
// suppress CSS parsing errors:
|
||||
// Note: e.detail contains the CSS which fails to parse - we check it
|
||||
// includes @container to make sure we aren't suppressing other CSS errors
|
||||
if (e.type === 'css parsing' && e.detail.includes('@container')) {
|
||||
return
|
||||
}
|
||||
|
||||
throw e
|
||||
})
|
||||
|
||||
// Redefining the Uint8Array global even though we're in a 'web' environment
|
||||
// overcomes the issue where `Buffer.from('hello') instanceof Uint8Array ===
|
||||
// false`. This is needed by webtorrent dependency k-bucket.
|
||||
// https://github.com/facebook/jest/issues/6248
|
||||
//
|
||||
// If removing this override results in all tests passing on all platforms,
|
||||
// then we can keep them removed.
|
||||
this.global.Uint8Array = Uint8Array
|
||||
|
||||
// We're adding features missing in JSDOM. If assertions fail, JSDOM has
|
||||
// these features now and we can remove our additions.
|
||||
assert(this.global.TextEncoder === undefined)
|
||||
this.global.TextEncoder = TextEncoder
|
||||
|
||||
assert(this.global.TextDecoder === undefined)
|
||||
this.global.TextDecoder = TextDecoder
|
||||
|
||||
assert(this.global.crypto === undefined)
|
||||
this.global.crypto = webcrypto
|
||||
|
||||
this.global.matchMedia = (query) => ({
|
||||
matches: false,
|
||||
media: query,
|
||||
onchange: null,
|
||||
addListener: () => {},
|
||||
removeListener: () => {},
|
||||
addEventListener: () => {},
|
||||
removeEventListener: () => {},
|
||||
dispatchEvent: () => {}
|
||||
})
|
||||
|
||||
// Fixed in jest >= 28 https://github.com/jestjs/jest/pull/12631
|
||||
assert(this.global.structuredClone === undefined)
|
||||
this.global.structuredClone = structuredClone
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,43 @@
|
||||
// Copyright (c) 2021 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 JSDOMEnvironment from 'jest-environment-jsdom'
|
||||
import assert from 'assert'
|
||||
|
||||
export default class CustomEnvironment extends JSDOMEnvironment {
|
||||
async setup() {
|
||||
await super.setup()
|
||||
|
||||
// Treat JSDOM errors as hard failures. These errors usually occur due to
|
||||
// unimplemented APIs, so it is better to detect those and explicitly mock.
|
||||
assert(this.dom.virtualConsole.listenerCount('jsdomError') === 1)
|
||||
this.dom.virtualConsole.removeAllListeners('jsdomError')
|
||||
|
||||
// We're adding features missing in JSDOM. If assertions fail, JSDOM has
|
||||
// these features now and we can remove our additions.
|
||||
assert(this.global.TextEncoder === undefined)
|
||||
this.global.TextEncoder = TextEncoder
|
||||
|
||||
assert(this.global.TextDecoder === undefined)
|
||||
this.global.TextDecoder = TextDecoder
|
||||
|
||||
assert(this.global.matchMedia === undefined)
|
||||
this.global.matchMedia = (query) => ({
|
||||
matches: false,
|
||||
media: query,
|
||||
onchange: null,
|
||||
addListener: () => {},
|
||||
removeListener: () => {},
|
||||
addEventListener: () => {},
|
||||
removeEventListener: () => {},
|
||||
dispatchEvent: () => {}
|
||||
})
|
||||
|
||||
// structuredClone is only available in jest-environment-node and not jsdom
|
||||
// https://github.com/jestjs/jest/pull/12631
|
||||
assert(this.global.structuredClone === undefined)
|
||||
this.global.structuredClone = structuredClone
|
||||
}
|
||||
}
|
||||
@@ -7,10 +7,6 @@ import { getMockChrome, getMockLoadTimeData } from './testData'
|
||||
|
||||
window.alert = jest.fn()
|
||||
|
||||
window.location = {
|
||||
search: '?testTorrentId'
|
||||
} as any
|
||||
|
||||
global.decodeURIComponent = () => 'test'
|
||||
|
||||
window.requestAnimationFrame = function (cb: FrameRequestCallback) {
|
||||
|
||||
@@ -6,20 +6,33 @@
|
||||
// For a detailed explanation regarding each configuration property, visit:
|
||||
// https://jestjs.io/docs/en/configuration.html
|
||||
|
||||
const fs = require('fs')
|
||||
import fs from 'fs'
|
||||
import type { Config } from 'jest'
|
||||
import { createJsWithTsEsmPreset } from 'ts-jest'
|
||||
|
||||
const crossPlatforms = ['mac', 'win']
|
||||
const buildConfigs = ['Component', 'Static', 'Debug', 'Release']
|
||||
const extraArchitectures = ['arm64', 'x86']
|
||||
|
||||
function getBuildOutputPathList(buildOutputRelativePath) {
|
||||
return buildConfigs.reduce((outDirs, outDir) =>
|
||||
[...outDirs, outDir, ...crossPlatforms.map(platform => `${platform}_${outDir}`)],
|
||||
[]).reduce((outDirs, outDir) =>
|
||||
[...outDirs, outDir, ...extraArchitectures.map(arch => `${outDir}_${arch}`)],
|
||||
[]).map(outDir =>
|
||||
`<rootDir>/../out/${outDir}/${buildOutputRelativePath}`
|
||||
)
|
||||
function getBuildOutputPathList(buildOutputRelativePath: string): string[] {
|
||||
return buildConfigs
|
||||
.reduce(
|
||||
(outDirs, outDir) => [
|
||||
...outDirs,
|
||||
outDir,
|
||||
...crossPlatforms.map((platform) => `${platform}_${outDir}`),
|
||||
],
|
||||
[],
|
||||
)
|
||||
.reduce(
|
||||
(outDirs, outDir) => [
|
||||
...outDirs,
|
||||
outDir,
|
||||
...extraArchitectures.map((arch) => `${outDir}_${arch}`),
|
||||
],
|
||||
[],
|
||||
)
|
||||
.map((outDir) => `<rootDir>/../out/${outDir}/${buildOutputRelativePath}`)
|
||||
}
|
||||
|
||||
function getReporters() {
|
||||
@@ -27,8 +40,8 @@ function getReporters() {
|
||||
return [
|
||||
[
|
||||
'<rootDir>/tools/jest_teamcity_reporter/jest_teamcity_reporter.js',
|
||||
{ 'suiteName': 'test-unit' }
|
||||
]
|
||||
{ 'suiteName': 'test-unit' },
|
||||
],
|
||||
]
|
||||
} else {
|
||||
return ['default']
|
||||
@@ -37,13 +50,11 @@ function getReporters() {
|
||||
|
||||
function getBuildConfig() {
|
||||
// Try to find the build config in any of the possible build directories
|
||||
const possiblePaths = getBuildOutputPathList(
|
||||
'gen/brave/build_flags.json'
|
||||
)
|
||||
const possiblePaths = getBuildOutputPathList('gen/brave/build_flags.json')
|
||||
|
||||
for (const configPath of possiblePaths) {
|
||||
// Remove <rootDir> placeholder and resolve the actual path
|
||||
const actualPath = configPath.replace('<rootDir>', __dirname)
|
||||
const actualPath = configPath.replace('<rootDir>', import.meta.dirname)
|
||||
if (fs.existsSync(actualPath)) {
|
||||
try {
|
||||
return JSON.parse(fs.readFileSync(actualPath, 'utf8'))
|
||||
@@ -57,29 +68,19 @@ function getBuildConfig() {
|
||||
return {
|
||||
enable_ai_chat: true,
|
||||
enable_brave_wallet: true,
|
||||
enable_email_aliases: true
|
||||
enable_email_aliases: true,
|
||||
}
|
||||
}
|
||||
|
||||
const buildConfig = getBuildConfig()
|
||||
|
||||
/**
|
||||
* @type {import('@jest/types').Config.InitialOptions}
|
||||
*/
|
||||
module.exports = {
|
||||
preset: 'ts-jest/presets/default',
|
||||
testEnvironment: '<rootDir>/components/test/testEnvironment.js',
|
||||
const jestConfig: Config = {
|
||||
...createJsWithTsEsmPreset({
|
||||
tsconfig: 'tsconfig-jest.json',
|
||||
useESM: true,
|
||||
}),
|
||||
testEnvironment: '<rootDir>/components/test/testEnvironment.ts',
|
||||
moduleFileExtensions: ['js', 'tsx', 'ts', 'json'],
|
||||
globals: {
|
||||
'ts-jest': {
|
||||
'tsconfig': 'tsconfig-jest.json',
|
||||
'isolatedModules': true,
|
||||
useESM: true
|
||||
}
|
||||
},
|
||||
transform: {
|
||||
'\\.(jsx|js|ts|tsx)$': 'ts-jest'
|
||||
},
|
||||
reporters: getReporters(),
|
||||
clearMocks: true,
|
||||
resetMocks: true,
|
||||
@@ -95,12 +96,11 @@ module.exports = {
|
||||
'!<rootDir>/components/**/store.ts',
|
||||
'!<rootDir>/components/test/*',
|
||||
'!<rootDir>/build/commands/lib/start.js',
|
||||
'!<rootDir>/build/commands/lib/jsconfig.json'
|
||||
'!<rootDir>/build/commands/lib/jsconfig.json',
|
||||
],
|
||||
testURL: 'http://localhost/',
|
||||
testMatch: [
|
||||
'<rootDir>/**/*.test.{js,ts,tsx}',
|
||||
'<rootDir>/components/test/**/*_test.{ts,tsx}'
|
||||
'<rootDir>/components/test/**/*_test.{ts,tsx}',
|
||||
],
|
||||
testPathIgnorePatterns: [
|
||||
'<rootDir>/build/commands/lib/test.js',
|
||||
@@ -113,11 +113,10 @@ module.exports = {
|
||||
: ['<rootDir>/components/brave_wallet_ui']),
|
||||
...(buildConfig.enable_email_aliases
|
||||
? []
|
||||
: ['<rootDir>/components/email_aliases'])
|
||||
: ['<rootDir>/components/email_aliases']),
|
||||
],
|
||||
testTimeout: 30000,
|
||||
transformIgnorePatterns: [
|
||||
'<rootDir>/node_modules/(?!.*/)',
|
||||
// prevent jest from transforming itself
|
||||
// https://github.com/jestjs/jest/issues/9503#issuecomment-709041807
|
||||
'<rootDir>/node_modules/@babel',
|
||||
@@ -125,7 +124,7 @@ module.exports = {
|
||||
'<rootDir>/node_modules/jest-runtime',
|
||||
'<rootDir>/node_modules/lodash',
|
||||
'signal-exit',
|
||||
'is-typedarray'
|
||||
'is-typedarray',
|
||||
],
|
||||
setupFilesAfterEnv: ['<rootDir>/components/test/testSetup.ts'],
|
||||
moduleNameMapper: {
|
||||
@@ -139,27 +138,29 @@ module.exports = {
|
||||
|
||||
// mocks for brave-wallet and brave-rewards proxies
|
||||
'\\/brave_rewards_api_proxy$':
|
||||
'<rootDir>/components/brave_wallet_ui/' +
|
||||
'common/async/__mocks__/brave_rewards_api_proxy.ts',
|
||||
'<rootDir>/components/brave_wallet_ui/'
|
||||
+ 'common/async/__mocks__/brave_rewards_api_proxy.ts',
|
||||
'\\/bridge$':
|
||||
'<rootDir>/components/brave_wallet_ui/common/async/__mocks__/bridge.ts',
|
||||
|
||||
// TODO(petemill): The ordering here can get problematic for devs
|
||||
// who have more than 1 build type at a time, since if the file exists
|
||||
// at the first path, it will be used for Type analysis instead of the second
|
||||
// path, even if it's more recent.
|
||||
// TODO(https://github.com/brave/brave-browser/issues/54640): The ordering
|
||||
// here can get problematic for devs who have more than 1 build type at a
|
||||
// time, since if the file exists at the first path, it will be used for
|
||||
// Type analysis instead of the second path, even if it's more recent.
|
||||
// It can also break if CI or devs perform a build in a directory not known
|
||||
// by this list.
|
||||
// Instead, we should get the directory from config.js:outputDir.
|
||||
'^gen\\/(.*)': getBuildOutputPathList('gen/$1'),
|
||||
'chrome://resources\\/(.*)': getBuildOutputPathList(
|
||||
'gen/ui/webui/resources/tsc/$1'
|
||||
'gen/ui/webui/resources/tsc/$1',
|
||||
),
|
||||
'chrome://interstitials\\/(.*)': getBuildOutputPathList(
|
||||
'gen/components/security_interstitials/core/$1'
|
||||
'gen/components/security_interstitials/core/$1',
|
||||
),
|
||||
// workaround for https://github.com/LedgerHQ/ledger-live/issues/763
|
||||
'@ledgerhq/devices/hid-framing':
|
||||
'<rootDir>/node_modules/@ledgerhq/devices/lib/hid-framing'
|
||||
}
|
||||
'<rootDir>/node_modules/@ledgerhq/devices/lib/hid-framing',
|
||||
},
|
||||
}
|
||||
|
||||
export default jestConfig
|
||||
Generated
+1901
-1774
File diff suppressed because it is too large
Load Diff
+6
-7
@@ -107,7 +107,7 @@
|
||||
"@storybook/react-webpack5": "8.6.14",
|
||||
"@storybook/theming": "8.6.14",
|
||||
"@storybook/types": "8.6.14",
|
||||
"@testing-library/jest-dom": "5.17.0",
|
||||
"@testing-library/jest-dom": "6.9.1",
|
||||
"@testing-library/react": "15.0.6",
|
||||
"@types/array-move": "2.0.0",
|
||||
"@types/async": "3.2.20",
|
||||
@@ -115,7 +115,7 @@
|
||||
"@types/chrome": "0.0.241",
|
||||
"@types/diff": "7.0.1",
|
||||
"@types/dom-navigation": "1.0.3",
|
||||
"@types/jest": "28.1.6",
|
||||
"@types/jest": "30.0.0",
|
||||
"@types/jszip": "3.4.1",
|
||||
"@types/node": "25.0.3",
|
||||
"@types/qr-image": "3.2.5",
|
||||
@@ -158,10 +158,10 @@
|
||||
"globals": "17.3.0",
|
||||
"https-browserify": "1.0.0",
|
||||
"identity-obj-proxy": "3.0.0",
|
||||
"jest": "28.1.3",
|
||||
"jest-environment-jsdom": "28.1.3",
|
||||
"jest-junit": "13.0.0",
|
||||
"jsdom": "26.0.0",
|
||||
"jest": "30.3.0",
|
||||
"jest-environment-jsdom": "30.3.0",
|
||||
"jest-junit": "16.0.0",
|
||||
"less": "3.13.1",
|
||||
"less-loader": "11.1.3",
|
||||
"log-update": "3.4.0",
|
||||
@@ -188,7 +188,7 @@
|
||||
"teamcity-service-messages": "0.1.14",
|
||||
"terser": "5.16.2",
|
||||
"timers-browserify": "2.0.12",
|
||||
"ts-jest": "28.0.8",
|
||||
"ts-jest": "29.4.9",
|
||||
"ts-loader": "9.5.2",
|
||||
"tsx": "4.19.2",
|
||||
"typesafe-actions": "2.2.0",
|
||||
@@ -242,7 +242,6 @@
|
||||
"webext-redux": "2.1.9"
|
||||
},
|
||||
"overrides": {
|
||||
"@jest/transform": "npm:@brave/jest-transform@28.1.3",
|
||||
"@zondax/ledger-filecoin": "2.0.4",
|
||||
"axios": "1.15.0",
|
||||
"elliptic": "6.6.1",
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
||||
// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
|
||||
|
||||
exports[`mangled files should have up to date snapshots ./chromium_src/chrome/browser/resources/app_home/app_home_empty_page.html.ts.lit_mangler.ts should match snapshot 1`] = `
|
||||
"===================================================================
|
||||
@@ -6,12 +6,12 @@ exports[`mangled files should have up to date snapshots ./chromium_src/chrome/br
|
||||
+++ gen/chrome/browser/resources/app_home/preprocessed/app_home_empty_page.html.ts
|
||||
@@ -6,10 +6,9 @@
|
||||
return html\`<!--_html_template_start_-->
|
||||
<div class=\\"container\\">
|
||||
<img src=\\"chrome://resources/images/apps_home_empty_238x170.svg\\">
|
||||
<div class="container">
|
||||
<img src="chrome://resources/images/apps_home_empty_238x170.svg">
|
||||
<p>$i18n{appAppearanceLabel}</p>
|
||||
- <a href=\\"https://support.google.com/chrome?p=install_web_apps\\"
|
||||
- target=\\"_blank\\">
|
||||
+ <a href=\\"https://support.brave.app/hc/en-us/articles/39077114659597\\" target=\\"_blank\\">
|
||||
- <a href="https://support.google.com/chrome?p=install_web_apps"
|
||||
- target="_blank">
|
||||
+ <a href="https://support.brave.app/hc/en-us/articles/39077114659597" target="_blank">
|
||||
<cr-button>$i18n{learnToInstall}</cr-button>
|
||||
</a>
|
||||
</div>
|
||||
@@ -29,16 +29,16 @@ exports[`mangled files should have up to date snapshots ./chromium_src/chrome/br
|
||||
export function getHtml(this: WindowModeItemElement) {
|
||||
return html\`<!--_html_template_start_-->
|
||||
-<app-management-toggle-row
|
||||
- id=\\"toggle-row\\"
|
||||
- label=\\"\${this.windowModeLabel}\\"
|
||||
- ?value=\\"\${this.getValue_()}\\">
|
||||
- id="toggle-row"
|
||||
- label="\${this.windowModeLabel}"
|
||||
- ?value="\${this.getValue_()}">
|
||||
-</app-management-toggle-row>
|
||||
+<div ?hidden=\\"\${this.app.hideWindowMode}\\">
|
||||
+ <div class=\\"permission-section-header\\">
|
||||
+ <div class=\\"header-text\\">$i18n{appManagementOpenModeLabel}</div>
|
||||
+<div ?hidden="\${this.app.hideWindowMode}">
|
||||
+ <div class="permission-section-header">
|
||||
+ <div class="header-text">$i18n{appManagementOpenModeLabel}</div>
|
||||
+ </div>
|
||||
+ <div class=\\"permission-list indented-permission-block\\">
|
||||
+ \${this.windowModes.map(mode => html\`<leo-radiobutton class=\\"subpermission-row\\" name=\\"window-mode\\" @change=\\"\${this.onChange}\\" value=\\"\${mode.value}\\" currentvalue=\\"\${this.app.windowMode}\\">
|
||||
+ <div class="permission-list indented-permission-block">
|
||||
+ \${this.windowModes.map(mode => html\`<leo-radiobutton class="subpermission-row" name="window-mode" @change="\${this.onChange}" value="\${mode.value}" currentvalue="\${this.app.windowMode}">
|
||||
+ \${mode.label}
|
||||
+ </leo-radiobutton>\`)}
|
||||
+ </div>
|
||||
@@ -53,21 +53,21 @@ exports[`mangled files should have up to date snapshots ./chromium_src/chrome/br
|
||||
--- ../chrome/browser/resources/extensions/detail_view.html.ts
|
||||
+++ gen/chrome/browser/resources/extensions/preprocessed/detail_view.html.ts
|
||||
@@ -346,16 +346,13 @@
|
||||
@change=\\"\${this.onPinnedToToolbarChange_}\\">
|
||||
@change="\${this.onPinnedToToolbarChange_}">
|
||||
<span>$i18n{itemPinToToolbar}</span>
|
||||
</extensions-toggle-row>\` : ''}
|
||||
\${this.shouldShowIncognitoOption_() ? html\`
|
||||
- <extensions-toggle-row id=\\"allow-incognito\\"
|
||||
- ?checked=\\"\${this.data.incognitoAccess.isActive}\\" class=\\"hr\\"
|
||||
- @change=\\"\${this.onAllowIncognitoChange_}\\">
|
||||
+ <extensions-toggle-row id=\\"allow-incognito\\" ?checked=\\"\${this.data.incognitoAccess.isActive}\\" class=\\"hr\\" @change=\\"\${this.onAllowIncognitoChange_}\\">
|
||||
- <extensions-toggle-row id="allow-incognito"
|
||||
- ?checked="\${this.data.incognitoAccess.isActive}" class="hr"
|
||||
- @change="\${this.onAllowIncognitoChange_}">
|
||||
+ <extensions-toggle-row id="allow-incognito" ?checked="\${this.data.incognitoAccess.isActive}" class="hr" @change="\${this.onAllowIncognitoChange_}">
|
||||
<div>
|
||||
<div>$i18n{itemAllowIncognito}</div>
|
||||
- <div class=\\"section-content\\">$i18n{incognitoInfoWarning}</div>
|
||||
- <div class=\\"section-content\\" id=\\"allow-incognito-warning\\"
|
||||
- ?hidden=\\"\${!this.data.incognitoAccessPendingChange}\\">
|
||||
+ <div class=\\"section-content\\">$i18n{privateInfoWarning}<span ?hidden=\\"\${!this.data.incognitoAccess.isActive}\\"> $i18n{spanningInfoWarning}</span><span> $i18n{privateAndTorInfoWarning}</span></div>
|
||||
+ <div class=\\"section-content\\" id=\\"allow-incognito-warning\\" ?hidden=\\"\${!this.data.incognitoAccessPendingChange}\\">
|
||||
- <div class="section-content">$i18n{incognitoInfoWarning}</div>
|
||||
- <div class="section-content" id="allow-incognito-warning"
|
||||
- ?hidden="\${!this.data.incognitoAccessPendingChange}">
|
||||
+ <div class="section-content">$i18n{privateInfoWarning}<span ?hidden="\${!this.data.incognitoAccess.isActive}"> $i18n{spanningInfoWarning}</span><span> $i18n{privateAndTorInfoWarning}</span></div>
|
||||
+ <div class="section-content" id="allow-incognito-warning" ?hidden="\${!this.data.incognitoAccessPendingChange}">
|
||||
$i18n{pendingChangeWarning}
|
||||
</div>
|
||||
</div>
|
||||
@@ -81,80 +81,80 @@ exports[`mangled files should have up to date snapshots ./chromium_src/chrome/br
|
||||
+++ gen/chrome/browser/resources/extensions/preprocessed/item.html.ts
|
||||
@@ -13,10 +13,9 @@
|
||||
</div>
|
||||
<div id=\\"card\\" class=\\"\${this.computeClasses_()}\\">
|
||||
<div id=\\"main\\">
|
||||
<div id=\\"icon-wrapper\\">
|
||||
- <img id=\\"icon\\" src=\\"\${this.data.iconUrl}\\"
|
||||
- aria-describedby=\\"a11yAssociation\\" alt=\\"\\">
|
||||
+ <img id=\\"icon\\" src=\\"\${this.data.iconUrl}\\" aria-describedby=\\"a11yAssociation\\" alt=\\"\\">
|
||||
<div id="card" class="\${this.computeClasses_()}">
|
||||
<div id="main">
|
||||
<div id="icon-wrapper">
|
||||
- <img id="icon" src="\${this.data.iconUrl}"
|
||||
- aria-describedby="a11yAssociation" alt="">
|
||||
+ <img id="icon" src="\${this.data.iconUrl}" aria-describedby="a11yAssociation" alt="">
|
||||
\${this.computeSourceIndicatorIcon_() ? html\`
|
||||
<div id=\\"source-indicator\\">
|
||||
<div class=\\"source-icon-wrapper\\" role=\\"img\\"
|
||||
aria-describedby=\\"a11yAssociation\\"
|
||||
<div id="source-indicator">
|
||||
<div class="source-icon-wrapper" role="img"
|
||||
aria-describedby="a11yAssociation"
|
||||
@@ -38,20 +37,19 @@
|
||||
<!--Note: We wrap inspect-views in a div so that the outer div
|
||||
doesn't shrink (because it's not display: flex).-->
|
||||
<div>
|
||||
<div id=\\"name-and-version\\" class=\\"layout-horizontal-center\\">
|
||||
- <div id=\\"name\\" role=\\"heading\\" aria-level=\\"3\\"
|
||||
- class=\\"clippable-flex-text\\">
|
||||
+ <div id=\\"name\\" role=\\"heading\\" aria-level=\\"3\\" class=\\"clippable-flex-text\\">
|
||||
<div id="name-and-version" class="layout-horizontal-center">
|
||||
- <div id="name" role="heading" aria-level="3"
|
||||
- class="clippable-flex-text">
|
||||
+ <div id="name" role="heading" aria-level="3" class="clippable-flex-text">
|
||||
\${this.data.name}
|
||||
</div>
|
||||
- <span id=\\"version\\" class=\\"cr-secondary-text\\"
|
||||
- ?hidden=\\"\${!this.inDevMode}\\">
|
||||
+ <span id=\\"version\\" class=\\"cr-secondary-text\\" ?hidden=\\"\${!this.inDevMode}\\">
|
||||
- <span id="version" class="cr-secondary-text"
|
||||
- ?hidden="\${!this.inDevMode}">
|
||||
+ <span id="version" class="cr-secondary-text" ?hidden="\${!this.inDevMode}">
|
||||
\${this.data.version}
|
||||
</span>
|
||||
- </div>
|
||||
+ </div><div ?hidden=\\"\${!this.isBraveHosted_(this.data.id)}\\" class=\\"brave-hosted\\">
|
||||
+ </div><div ?hidden="\${!this.isBraveHosted_(this.data.id)}" class="brave-hosted">
|
||||
+ $i18n{braveHosted}
|
||||
+ </div>
|
||||
</div>
|
||||
- <div id=\\"description\\" class=\\"cr-secondary-text multiline-clippable-text\\"
|
||||
- ?hidden=\\"\${!this.showDescription_()}\\">
|
||||
+ <div id=\\"description\\" class=\\"cr-secondary-text multiline-clippable-text\\" ?hidden=\\"\${!this.showDescription_()}\\">
|
||||
- <div id="description" class="cr-secondary-text multiline-clippable-text"
|
||||
- ?hidden="\${!this.showDescription_()}">
|
||||
+ <div id="description" class="cr-secondary-text multiline-clippable-text" ?hidden="\${!this.showDescription_()}">
|
||||
\${this.data.description}
|
||||
</div>
|
||||
\${this.showSevereWarnings() ? html\`
|
||||
<div id=\\"warnings\\">
|
||||
<div id="warnings">
|
||||
@@ -132,15 +130,12 @@
|
||||
</div>
|
||||
</div>
|
||||
<div id=\\"button-strip\\" class=\\"layout-horizontal-center cr-secondary-text\\">
|
||||
<div class=\\"layout-horizontal-center flex\\">
|
||||
- <cr-button id=\\"detailsButton\\" @click=\\"\${this.onDetailsClick_}\\"
|
||||
- aria-describedby=\\"a11yAssociation\\">
|
||||
+ <cr-button id=\\"detailsButton\\" @click=\\"\${this.onDetailsClick_}\\" aria-describedby=\\"a11yAssociation\\">
|
||||
<div id="button-strip" class="layout-horizontal-center cr-secondary-text">
|
||||
<div class="layout-horizontal-center flex">
|
||||
- <cr-button id="detailsButton" @click="\${this.onDetailsClick_}"
|
||||
- aria-describedby="a11yAssociation">
|
||||
+ <cr-button id="detailsButton" @click="\${this.onDetailsClick_}" aria-describedby="a11yAssociation">
|
||||
$i18n{itemDetails}
|
||||
</cr-button>
|
||||
- <cr-button id=\\"removeButton\\" @click=\\"\${this.onRemoveClick_}\\"
|
||||
- aria-describedby=\\"a11yAssociation\\"
|
||||
- ?hidden=\\"\${this.data.mustRemainInstalled}\\">
|
||||
+ <cr-button id=\\"removeButton\\" @click=\\"\${this.onRemoveClick_}\\" aria-describedby=\\"a11yAssociation\\" ?hidden=\\"\${this.data.mustRemainInstalled}\\">
|
||||
- <cr-button id="removeButton" @click="\${this.onRemoveClick_}"
|
||||
- aria-describedby="a11yAssociation"
|
||||
- ?hidden="\${this.data.mustRemainInstalled}">
|
||||
+ <cr-button id="removeButton" @click="\${this.onRemoveClick_}" aria-describedby="a11yAssociation" ?hidden="\${this.data.mustRemainInstalled}">
|
||||
$i18n{remove}
|
||||
</cr-button>
|
||||
\${this.shouldShowErrorsButton_() ? html\`
|
||||
<cr-button id=\\"errors-button\\"
|
||||
<cr-button id="errors-button"
|
||||
@@ -172,20 +167,11 @@
|
||||
<cr-button id=\\"terminated-reload-button\\" @click=\\"\${this.onReloadClick_}\\"
|
||||
aria-describedby=\\"a11yAssociation\\" class=\\"action-button\\">
|
||||
<cr-button id="terminated-reload-button" @click="\${this.onReloadClick_}"
|
||||
aria-describedby="a11yAssociation" class="action-button">
|
||||
$i18n{itemReload}
|
||||
</cr-button>\` : ''}
|
||||
- <cr-tooltip-icon id=\\"parentDisabledPermissionsToolTip\\"
|
||||
- ?hidden=\\"\${!this.data.disableReasons.parentDisabledPermissions}\\"
|
||||
- tooltip-text=\\"$i18n{parentDisabledPermissions}\\"
|
||||
- icon-class=\\"cr20:kite\\"
|
||||
- icon-aria-label=\\"$i18n{parentDisabledPermissions}\\">
|
||||
+ <cr-tooltip-icon id=\\"parentDisabledPermissionsToolTip\\" ?hidden=\\"\${!this.data.disableReasons.parentDisabledPermissions}\\" tooltip-text=\\"$i18n{parentDisabledPermissions}\\" icon-class=\\"cr20:kite\\" icon-aria-label=\\"$i18n{parentDisabledPermissions}\\">
|
||||
- <cr-tooltip-icon id="parentDisabledPermissionsToolTip"
|
||||
- ?hidden="\${!this.data.disableReasons.parentDisabledPermissions}"
|
||||
- tooltip-text="$i18n{parentDisabledPermissions}"
|
||||
- icon-class="cr20:kite"
|
||||
- icon-aria-label="$i18n{parentDisabledPermissions}">
|
||||
+ <cr-tooltip-icon id="parentDisabledPermissionsToolTip" ?hidden="\${!this.data.disableReasons.parentDisabledPermissions}" tooltip-text="$i18n{parentDisabledPermissions}" icon-class="cr20:kite" icon-aria-label="$i18n{parentDisabledPermissions}">
|
||||
</cr-tooltip-icon>
|
||||
- <cr-toggle id=\\"enableToggle\\"
|
||||
- aria-label=\\"\${this.getEnableToggleAriaLabel_()}\\"
|
||||
- aria-describedby=\\"a11yAssociation\\"
|
||||
- ?checked=\\"\${this.isEnabled_()}\\" @change=\\"\${this.onEnableToggleChange_}\\"
|
||||
- ?disabled=\\"\${!this.isEnableToggleEnabled_()}\\"
|
||||
- ?hidden=\\"\${!this.showEnableToggle_()}\\">
|
||||
+ <cr-toggle id=\\"enableToggle\\" aria-label=\\"\${this.getEnableToggleAriaLabel_()}\\" aria-describedby=\\"a11yAssociation\\" ?checked=\\"\${this.isEnabled_()}\\" @change=\\"\${this.onEnableToggleChange_}\\" ?disabled=\\"\${!this.isEnableToggleEnabled_()}\\" ?hidden=\\"\${!this.showEnableToggle_()}\\">
|
||||
- <cr-toggle id="enableToggle"
|
||||
- aria-label="\${this.getEnableToggleAriaLabel_()}"
|
||||
- aria-describedby="a11yAssociation"
|
||||
- ?checked="\${this.isEnabled_()}" @change="\${this.onEnableToggleChange_}"
|
||||
- ?disabled="\${!this.isEnableToggleEnabled_()}"
|
||||
- ?hidden="\${!this.showEnableToggle_()}">
|
||||
+ <cr-toggle id="enableToggle" aria-label="\${this.getEnableToggleAriaLabel_()}" aria-describedby="a11yAssociation" ?checked="\${this.isEnabled_()}" @change="\${this.onEnableToggleChange_}" ?disabled="\${!this.isEnableToggleEnabled_()}" ?hidden="\${!this.showEnableToggle_()}">
|
||||
</cr-toggle>
|
||||
</div>
|
||||
</div>
|
||||
@@ -168,7 +168,7 @@ exports[`mangled files should have up to date snapshots ./chromium_src/chrome/br
|
||||
+++ gen/chrome/browser/resources/history/preprocessed/synced_device_manager.html.ts
|
||||
@@ -1,16 +1,15 @@
|
||||
import {html} from '//resources/lit/v3_0/lit.rollup.js';
|
||||
-// <if expr=\\"not is_chromeos\\">
|
||||
-// <if expr="not is_chromeos">
|
||||
+//
|
||||
import {HistorySignInState} from './constants.js';
|
||||
-// </if>
|
||||
@@ -179,43 +179,43 @@ exports[`mangled files should have up to date snapshots ./chromium_src/chrome/br
|
||||
export function getHtml(this: HistorySyncedDeviceManagerElement) {
|
||||
// clang-format off
|
||||
return html\`<!--_html_template_start_-->
|
||||
-<div id=\\"synced-device-list\\" class=\\"history-cards\\"
|
||||
- ?hidden=\\"\${!this.syncedDevices_.length}\\">
|
||||
+<div id=\\"synced-device-list\\" class=\\"history-cards\\" ?hidden=\\"\${!this.syncedDevices_.length}\\">
|
||||
-<div id="synced-device-list" class="history-cards"
|
||||
- ?hidden="\${!this.syncedDevices_.length}">
|
||||
+<div id="synced-device-list" class="history-cards" ?hidden="\${!this.syncedDevices_.length}">
|
||||
\${this.syncedDevices_.map((syncedDevice, index) => html\`
|
||||
<history-synced-device-card
|
||||
.device=\\"\${syncedDevice.device}\\"
|
||||
.lastUpdateTime=\\"\${syncedDevice.lastUpdateTime}\\"
|
||||
.device="\${syncedDevice.device}"
|
||||
.lastUpdateTime="\${syncedDevice.lastUpdateTime}"
|
||||
@@ -23,26 +22,23 @@
|
||||
data-index=\\"\${index}\\">
|
||||
data-index="\${index}">
|
||||
</history-synced-device-card>
|
||||
\`)}
|
||||
</div>
|
||||
-<div id=\\"noSyncedTabs\\" class=\\"centered-message\\"
|
||||
- ?hidden=\\"\${!this.showNoSyncedMessage_()}\\">
|
||||
+<div id=\\"noSyncedTabs\\" class=\\"centered-message\\" ?hidden=\\"\${!this.showNoSyncedMessage_()}\\">
|
||||
-<div id="noSyncedTabs" class="centered-message"
|
||||
- ?hidden="\${!this.showNoSyncedMessage_()}">
|
||||
+<div id="noSyncedTabs" class="centered-message" ?hidden="\${!this.showNoSyncedMessage_()}">
|
||||
\${this.noSyncedTabsMessage_()}
|
||||
</div>
|
||||
|
||||
-<div id=\\"signInGuide\\"
|
||||
- ?hidden=\\"\${!this.showSignInGuide_()
|
||||
- || this.replaceSyncPromosWithSignInPromos_}\\">
|
||||
+<div id=\\"signInGuide\\" ?hidden=\\"\${!this.showSignInGuide_()
|
||||
+ || this.replaceSyncPromosWithSignInPromos_}\\" style=\\"display: none\\">
|
||||
<div id=\\"sync-promo-illustration\\"></div>
|
||||
<div id=\\"turn-on-sync-promo\\">$i18n{turnOnSyncPromo}</div>
|
||||
<div id=\\"turn-on-sync-promo-desc\\">$i18n{turnOnSyncPromoDesc}</div>
|
||||
- <cr-button id=\\"turn-on-sync-button\\" class=\\"action-button\\"
|
||||
- @click=\\"\${this.onTurnOnSyncClick_}\\">
|
||||
+ <cr-button id=\\"turn-on-sync-button\\" class=\\"action-button\\" @click=\\"\${this.onTurnOnSyncClick_}\\">
|
||||
-<div id="signInGuide"
|
||||
- ?hidden="\${!this.showSignInGuide_()
|
||||
- || this.replaceSyncPromosWithSignInPromos_}">
|
||||
+<div id="signInGuide" ?hidden="\${!this.showSignInGuide_()
|
||||
+ || this.replaceSyncPromosWithSignInPromos_}" style="display: none">
|
||||
<div id="sync-promo-illustration"></div>
|
||||
<div id="turn-on-sync-promo">$i18n{turnOnSyncPromo}</div>
|
||||
<div id="turn-on-sync-promo-desc">$i18n{turnOnSyncPromoDesc}</div>
|
||||
- <cr-button id="turn-on-sync-button" class="action-button"
|
||||
- @click="\${this.onTurnOnSyncClick_}">
|
||||
+ <cr-button id="turn-on-sync-button" class="action-button" @click="\${this.onTurnOnSyncClick_}">
|
||||
$i18n{turnOnSyncButton}
|
||||
</cr-button>
|
||||
</div>
|
||||
|
||||
-<if expr=\\"not is_chromeos\\">
|
||||
-<if expr="not is_chromeos">
|
||||
+
|
||||
\${this.shouldShowHistorySyncOptIn_() ? html\`
|
||||
<div id=\\"history-sync-optin\\" class=\\"history-sync-optin\\">
|
||||
<div id="history-sync-optin" class="history-sync-optin">
|
||||
\${this.isSignInState_(HistorySignInState.SIGNED_OUT)
|
||||
|| this.isSignInState_(HistorySignInState.WEB_ONLY_SIGNED_IN) ? html\`
|
||||
@@ -120,11 +116,11 @@
|
||||
@@ -225,20 +225,20 @@ exports[`mangled files should have up to date snapshots ./chromium_src/chrome/br
|
||||
\` : ''}
|
||||
-</if>
|
||||
|
||||
-<cr-lazy-render-lit id=\\"menu\\" .template='\${() => html\`
|
||||
-<cr-lazy-render-lit id="menu" .template='\${() => html\`
|
||||
+
|
||||
+<cr-lazy-render-lit id=\\"menu\\" .template=\\"\${() => html\`
|
||||
<cr-action-menu role-description=\\"$i18n{menu}\\">
|
||||
<button id=\\"menuOpenButton\\" class=\\"dropdown-item\\"
|
||||
@click=\\"\${this.onOpenAllClick_}\\">
|
||||
+<cr-lazy-render-lit id="menu" .template="\${() => html\`
|
||||
<cr-action-menu role-description="$i18n{menu}">
|
||||
<button id="menuOpenButton" class="dropdown-item"
|
||||
@click="\${this.onOpenAllClick_}">
|
||||
$i18n{openAll}
|
||||
@@ -133,9 +129,9 @@
|
||||
@click=\\"\${this.onDeleteSessionClick_}\\">
|
||||
@click="\${this.onDeleteSessionClick_}">
|
||||
$i18n{deleteSession}
|
||||
</button>
|
||||
</cr-action-menu>
|
||||
-\`}'>
|
||||
+\`}\\">
|
||||
+\`}">
|
||||
</cr-lazy-render-lit>
|
||||
<!--_html_template_end_-->\`;
|
||||
// clang-format on
|
||||
@@ -255,52 +255,52 @@ exports[`mangled files should have up to date snapshots ./chromium_src/chrome/br
|
||||
export function getHtml(this: AppElement) {
|
||||
// clang-format off
|
||||
return html\`<!--_html_template_start_-->
|
||||
-<cr-page-selector id=\\"container\\"
|
||||
- class=\\"sp-scroller sp-scroller-top-of-page sp-scroller-bottom-of-page\\"
|
||||
- selected=\\"\${this.page_}\\" attr-for-selected=\\"page-name\\">
|
||||
+<cr-page-selector id=\\"container\\" class=\\"sp-scroller sp-scroller-top-of-page sp-scroller-bottom-of-page\\" selected=\\"\${this.page_}\\" attr-for-selected=\\"page-name\\">
|
||||
<div page-name=\\"overview\\" id=\\"overviewPage\\">
|
||||
<div id=\\"appearance\\" class=\\"section sp-card\\">
|
||||
-<cr-page-selector id="container"
|
||||
- class="sp-scroller sp-scroller-top-of-page sp-scroller-bottom-of-page"
|
||||
- selected="\${this.page_}" attr-for-selected="page-name">
|
||||
+<cr-page-selector id="container" class="sp-scroller sp-scroller-top-of-page sp-scroller-bottom-of-page" selected="\${this.page_}" attr-for-selected="page-name">
|
||||
<div page-name="overview" id="overviewPage">
|
||||
<div id="appearance" class="section sp-card">
|
||||
- <sp-heading hide-back-button>
|
||||
- <h2 slot=\\"heading\\">$i18n{appearanceHeader}</h2>
|
||||
+ <sp-heading hide-back-button=\\"\\">
|
||||
+ <close-panel-button id=\\"closeButton\\" iron-icon=\\"close\\" slot=\\"buttons\\"></close-panel-button>
|
||||
+ <h2 slot=\\"heading\\"><leo-icon name=\\"themes\\"></leo-icon>$i18n{appearanceHeader}</h2>
|
||||
- <h2 slot="heading">$i18n{appearanceHeader}</h2>
|
||||
+ <sp-heading hide-back-button="">
|
||||
+ <close-panel-button id="closeButton" iron-icon="close" slot="buttons"></close-panel-button>
|
||||
+ <h2 slot="heading"><leo-icon name="themes"></leo-icon>$i18n{appearanceHeader}</h2>
|
||||
</sp-heading>
|
||||
- <customize-chrome-appearance @edit-theme-click=\\"\${this.onEditThemeClick_}\\"
|
||||
- @wallpaper-search-click=\\"\${this.onWallpaperSearchClick_}\\"
|
||||
- id=\\"appearanceElement\\">
|
||||
+ <customize-chrome-appearance @edit-theme-click=\\"\${this.onEditThemeClick_}\\" @wallpaper-search-click=\\"\${this.onWallpaperSearchClick_}\\" id=\\"appearanceElement\\">
|
||||
- <customize-chrome-appearance @edit-theme-click="\${this.onEditThemeClick_}"
|
||||
- @wallpaper-search-click="\${this.onWallpaperSearchClick_}"
|
||||
- id="appearanceElement">
|
||||
+ <customize-chrome-appearance @edit-theme-click="\${this.onEditThemeClick_}" @wallpaper-search-click="\${this.onWallpaperSearchClick_}" id="appearanceElement">
|
||||
</customize-chrome-appearance>
|
||||
- </div>
|
||||
+
|
||||
+ <brave-darker-theme-toggle></brave-darker-theme-toggle></div>
|
||||
<hr class=\\"sp-cards-separator\\">
|
||||
- <cr-button id=\\"toolbarButton\\" class=\\"section sp-card\\"
|
||||
- @click=\\"\${this.onToolbarCustomizationButtonClick_}\\">
|
||||
- <sp-heading hide-back-button id=\\"toolbar-customization-heading\\">
|
||||
- <h2 slot=\\"heading\\" id=\\"toolbar-customization-inner-heading\\"
|
||||
- aria-label=\\"$i18n{toolbarButtonA11yLabel}\\">
|
||||
<hr class="sp-cards-separator">
|
||||
- <cr-button id="toolbarButton" class="section sp-card"
|
||||
- @click="\${this.onToolbarCustomizationButtonClick_}">
|
||||
- <sp-heading hide-back-button id="toolbar-customization-heading">
|
||||
- <h2 slot="heading" id="toolbar-customization-inner-heading"
|
||||
- aria-label="$i18n{toolbarButtonA11yLabel}">
|
||||
- $i18n{toolbarHeader}
|
||||
- </h2>
|
||||
+ <cr-button id=\\"toolbarButton\\" class=\\"section sp-card\\" @click=\\"\${this.onToolbarCustomizationButtonClick_}\\">
|
||||
+ <sp-heading hide-back-button=\\"\\" id=\\"toolbar-customization-heading\\">
|
||||
+ <h2 slot=\\"heading\\" id=\\"toolbar-customization-inner-heading\\" aria-label=\\"$i18n{toolbarButtonA11yLabel}\\">$i18n{braveCustomizeMenuToolbarLabel}</h2>
|
||||
+ <cr-button id="toolbarButton" class="section sp-card" @click="\${this.onToolbarCustomizationButtonClick_}">
|
||||
+ <sp-heading hide-back-button="" id="toolbar-customization-heading">
|
||||
+ <h2 slot="heading" id="toolbar-customization-inner-heading" aria-label="$i18n{toolbarButtonA11yLabel}">$i18n{braveCustomizeMenuToolbarLabel}</h2>
|
||||
</sp-heading>
|
||||
- <cr-icon icon=\\"cr:chevron-right\\" slot=\\"suffix-icon\\"></cr-icon>
|
||||
+ <cr-icon icon=\\"window-edit\\" slot=\\"prefix-icon\\"></cr-icon>
|
||||
- <cr-icon icon="cr:chevron-right" slot="suffix-icon"></cr-icon>
|
||||
+ <cr-icon icon="window-edit" slot="prefix-icon"></cr-icon>
|
||||
</cr-button>
|
||||
\${this.ntpNextFeaturesEnabled_ && this.aimPolicyEnabled_
|
||||
&& this.isSourceTabFirstPartyNtp_() ? html\`
|
||||
<hr class=\\"sp-cards-separator\\">
|
||||
<hr class="sp-cards-separator">
|
||||
@@ -108,10 +102,9 @@
|
||||
<customize-chrome-wallpaper-search @back-click=\\"\${this.onBackClick_}\\"
|
||||
page-name=\\"wallpaper-search\\" id=\\"wallpaperSearchPage\\">
|
||||
<customize-chrome-wallpaper-search @back-click="\${this.onBackClick_}"
|
||||
page-name="wallpaper-search" id="wallpaperSearchPage">
|
||||
</customize-chrome-wallpaper-search>
|
||||
\` : ''}
|
||||
- <customize-chrome-toolbar @back-click=\\"\${this.onBackClick_}\\"
|
||||
- page-name=\\"toolbar\\" id=\\"toolbarPage\\"></customize-chrome-toolbar>
|
||||
+ <customize-chrome-toolbar @back-click=\\"\${this.onBackClick_}\\" page-name=\\"toolbar\\" id=\\"toolbarPage\\"></customize-chrome-toolbar>
|
||||
- <customize-chrome-toolbar @back-click="\${this.onBackClick_}"
|
||||
- page-name="toolbar" id="toolbarPage"></customize-chrome-toolbar>
|
||||
+ <customize-chrome-toolbar @back-click="\${this.onBackClick_}" page-name="toolbar" id="toolbarPage"></customize-chrome-toolbar>
|
||||
</cr-page-selector>
|
||||
<!--_html_template_end_-->\`;
|
||||
// clang-format on
|
||||
@@ -317,100 +317,100 @@ exports[`mangled files should have up to date snapshots ./chromium_src/chrome/br
|
||||
export function getHtml(this: AppearanceElement) {
|
||||
// clang-format off
|
||||
return html\`<!--_html_template_start_-->
|
||||
-<customize-chrome-theme-snapshot id=\\"themeSnapshot\\"
|
||||
- @edit-theme-click=\\"\${this.onEditThemeClick_}\\"
|
||||
- ?hidden=\\"\${!this.showThemeSnapshot_}\\">
|
||||
+<customize-chrome-theme-snapshot id=\\"themeSnapshot\\" @edit-theme-click=\\"\${this.onEditThemeClick_}\\" ?hidden=\\"\${!this.showThemeSnapshot_}\\" style=\\"display: none\\">
|
||||
-<customize-chrome-theme-snapshot id="themeSnapshot"
|
||||
- @edit-theme-click="\${this.onEditThemeClick_}"
|
||||
- ?hidden="\${!this.showThemeSnapshot_}">
|
||||
+<customize-chrome-theme-snapshot id="themeSnapshot" @edit-theme-click="\${this.onEditThemeClick_}" ?hidden="\${!this.showThemeSnapshot_}" style="display: none">
|
||||
</customize-chrome-theme-snapshot>
|
||||
-<customize-chrome-hover-button id=\\"thirdPartyThemeLinkButton\\"
|
||||
- class=\\"link-out-button theme-button\\"
|
||||
- ?hidden=\\"\${!this.thirdPartyThemeId_}\\"
|
||||
- @click=\\"\${this.onThirdPartyThemeLinkButtonClick_}\\"
|
||||
- label=\\"\${this.thirdPartyThemeName_}\\"
|
||||
- label-description=\\"$i18n{currentTheme}\\">
|
||||
+<customize-chrome-hover-button id=\\"thirdPartyThemeLinkButton\\" class=\\"link-out-button theme-button\\" ?hidden=\\"\${!this.thirdPartyThemeId_}\\" @click=\\"\${this.onThirdPartyThemeLinkButtonClick_}\\" label=\\"\${this.thirdPartyThemeName_}\\" label-description=\\"$i18n{currentTheme}\\">
|
||||
-<customize-chrome-hover-button id="thirdPartyThemeLinkButton"
|
||||
- class="link-out-button theme-button"
|
||||
- ?hidden="\${!this.thirdPartyThemeId_}"
|
||||
- @click="\${this.onThirdPartyThemeLinkButtonClick_}"
|
||||
- label="\${this.thirdPartyThemeName_}"
|
||||
- label-description="$i18n{currentTheme}">
|
||||
+<customize-chrome-hover-button id="thirdPartyThemeLinkButton" class="link-out-button theme-button" ?hidden="\${!this.thirdPartyThemeId_}" @click="\${this.onThirdPartyThemeLinkButtonClick_}" label="\${this.thirdPartyThemeName_}" label-description="$i18n{currentTheme}">
|
||||
</customize-chrome-hover-button>
|
||||
-<customize-chrome-hover-button id=\\"uploadedImageButton\\" class=\\"theme-button\\"
|
||||
- ?hidden=\\"\${!this.showUploadedImageButton_}\\"
|
||||
- @click=\\"\${this.onUploadedImageButtonClick_}\\"
|
||||
- label=\\"$i18n{yourUploadedImage}\\"
|
||||
- label-description=\\"$i18n{currentTheme}\\">
|
||||
+<customize-chrome-hover-button id=\\"uploadedImageButton\\" class=\\"theme-button\\" ?hidden=\\"\${!this.showUploadedImageButton_}\\" @click=\\"\${this.onUploadedImageButtonClick_}\\" label=\\"$i18n{yourUploadedImage}\\" label-description=\\"$i18n{currentTheme}\\">
|
||||
-<customize-chrome-hover-button id="uploadedImageButton" class="theme-button"
|
||||
- ?hidden="\${!this.showUploadedImageButton_}"
|
||||
- @click="\${this.onUploadedImageButtonClick_}"
|
||||
- label="$i18n{yourUploadedImage}"
|
||||
- label-description="$i18n{currentTheme}">
|
||||
+<customize-chrome-hover-button id="uploadedImageButton" class="theme-button" ?hidden="\${!this.showUploadedImageButton_}" @click="\${this.onUploadedImageButtonClick_}" label="$i18n{yourUploadedImage}" label-description="$i18n{currentTheme}">
|
||||
</customize-chrome-hover-button>
|
||||
-<customize-chrome-hover-button id=\\"searchedImageButton\\" class=\\"theme-button\\"
|
||||
- ?hidden=\\"\${!this.showSearchedImageButton_}\\"
|
||||
- @click=\\"\${this.onSearchedImageButtonClick_}\\"
|
||||
- label=\\"$i18n{yourSearchedImage}\\"
|
||||
- label-description=\\"$i18n{currentTheme}\\">
|
||||
+<customize-chrome-hover-button id=\\"searchedImageButton\\" class=\\"theme-button\\" ?hidden=\\"\${!this.showSearchedImageButton_}\\" @click=\\"\${this.onSearchedImageButtonClick_}\\" label=\\"$i18n{yourSearchedImage}\\" label-description=\\"$i18n{currentTheme}\\">
|
||||
-<customize-chrome-hover-button id="searchedImageButton" class="theme-button"
|
||||
- ?hidden="\${!this.showSearchedImageButton_}"
|
||||
- @click="\${this.onSearchedImageButtonClick_}"
|
||||
- label="$i18n{yourSearchedImage}"
|
||||
- label-description="$i18n{currentTheme}">
|
||||
+<customize-chrome-hover-button id="searchedImageButton" class="theme-button" ?hidden="\${!this.showSearchedImageButton_}" @click="\${this.onSearchedImageButtonClick_}" label="$i18n{yourSearchedImage}" label-description="$i18n{currentTheme}">
|
||||
</customize-chrome-hover-button>
|
||||
\${this.showManagedButton_ ? html\`
|
||||
- <customize-chrome-hover-button id=\\"thirdPartyManageLinkButton\\"
|
||||
- aria-button-label=\\"\${this.i18n('newTabPageManagedByA11yLabel',
|
||||
- this.managedByName_)}\\"
|
||||
- class=\\"link-out-button theme-button\\"
|
||||
- @click=\\"\${this.onNewTabPageManageByButtonClick_}\\"
|
||||
- label=\\"\${this.managedByName_}\\"
|
||||
- label-description=\\"\${this.managedByDesc_}\\">
|
||||
+ <customize-chrome-hover-button id=\\"thirdPartyManageLinkButton\\" aria-button-label=\\"\${this.i18n('newTabPageManagedByA11yLabel',
|
||||
+ this.managedByName_)}\\" class=\\"link-out-button theme-button\\" @click=\\"\${this.onNewTabPageManageByButtonClick_}\\" label=\\"\${this.managedByName_}\\" label-description=\\"\${this.managedByDesc_}\\" style=\\"display: none\\">
|
||||
- <customize-chrome-hover-button id="thirdPartyManageLinkButton"
|
||||
- aria-button-label="\${this.i18n('newTabPageManagedByA11yLabel',
|
||||
- this.managedByName_)}"
|
||||
- class="link-out-button theme-button"
|
||||
- @click="\${this.onNewTabPageManageByButtonClick_}"
|
||||
- label="\${this.managedByName_}"
|
||||
- label-description="\${this.managedByDesc_}">
|
||||
+ <customize-chrome-hover-button id="thirdPartyManageLinkButton" aria-button-label="\${this.i18n('newTabPageManagedByA11yLabel',
|
||||
+ this.managedByName_)}" class="link-out-button theme-button" @click="\${this.onNewTabPageManageByButtonClick_}" label="\${this.managedByName_}" label-description="\${this.managedByDesc_}" style="display: none">
|
||||
</customize-chrome-hover-button>
|
||||
\`: ''}
|
||||
-<div id=\\"editButtonsContainer\\" ?hidden=\\"\${!this.showEditTheme_}\\">
|
||||
- <cr-button id=\\"editThemeButton\\" @click=\\"\${this.onEditThemeClick_}\\"
|
||||
- class=\\"floating-button\\">
|
||||
- <div id=\\"editThemeIcon\\" class=\\"cr-icon edit-theme-icon\\" slot=\\"prefix-icon\\"
|
||||
- ?hidden=\\"\${this.wallpaperSearchButtonEnabled_}\\"></div>
|
||||
-<div id="editButtonsContainer" ?hidden="\${!this.showEditTheme_}">
|
||||
- <cr-button id="editThemeButton" @click="\${this.onEditThemeClick_}"
|
||||
- class="floating-button">
|
||||
- <div id="editThemeIcon" class="cr-icon edit-theme-icon" slot="prefix-icon"
|
||||
- ?hidden="\${this.wallpaperSearchButtonEnabled_}"></div>
|
||||
- \${this.editThemeButtonText_}
|
||||
- </cr-button>
|
||||
- \${this.wallpaperSearchButtonEnabled_ ? html\`
|
||||
- <cr-button id=\\"wallpaperSearchButton\\"
|
||||
- @click=\\"\${this.onWallpaperSearchClick_}\\" class=\\"floating-button\\">
|
||||
- <div id=\\"wallpaperSearchIcon\\" class=\\"cr-icon edit-theme-icon\\"
|
||||
- slot=\\"prefix-icon\\"></div>
|
||||
- <cr-button id="wallpaperSearchButton"
|
||||
- @click="\${this.onWallpaperSearchClick_}" class="floating-button">
|
||||
- <div id="wallpaperSearchIcon" class="cr-icon edit-theme-icon"
|
||||
- slot="prefix-icon"></div>
|
||||
- $i18n{wallpaperSearchTileLabel}
|
||||
- </cr-button>
|
||||
- \` : ''}
|
||||
-</div>
|
||||
+
|
||||
<hr class=\\"sp-hr\\" ?hidden=\\"\${!this.showEditTheme_}\\">
|
||||
<hr class="sp-hr" ?hidden="\${!this.showEditTheme_}">
|
||||
<customize-color-scheme-mode></customize-color-scheme-mode>
|
||||
<cr-theme-color-picker id=\\"chromeColors\\" ?hidden=\\"\${!this.showColorPicker_}\\">
|
||||
<cr-theme-color-picker id="chromeColors" ?hidden="\${!this.showColorPicker_}">
|
||||
</cr-theme-color-picker>
|
||||
<hr class=\\"sp-hr\\" ?hidden=\\"\${!this.showBottomDivider_}\\">
|
||||
-<div id=\\"followThemeToggle\\" class=\\"sp-card-content\\"
|
||||
- ?hidden=\\"\${!this.showDeviceThemeToggle_}\\">
|
||||
+<div id=\\"followThemeToggle\\" class=\\"sp-card-content\\" ?hidden=\\"\${!this.showDeviceThemeToggle_}\\">
|
||||
<div id=\\"followThemeToggleTitle\\">$i18n{followThemeToggle}</div>
|
||||
- <cr-toggle id=\\"followThemeToggleControl\\" title=\\"$i18n{followThemeToggle}\\"
|
||||
- ?checked=\\"\${!!this.theme_ && this.theme_.followDeviceTheme}\\"
|
||||
- @change=\\"\${this.onFollowThemeToggleChange_}\\">
|
||||
+ <cr-toggle id=\\"followThemeToggleControl\\" title=\\"$i18n{followThemeToggle}\\" ?checked=\\"\${!!this.theme_ && this.theme_.followDeviceTheme}\\" @change=\\"\${this.onFollowThemeToggleChange_}\\">
|
||||
<hr class="sp-hr" ?hidden="\${!this.showBottomDivider_}">
|
||||
-<div id="followThemeToggle" class="sp-card-content"
|
||||
- ?hidden="\${!this.showDeviceThemeToggle_}">
|
||||
+<div id="followThemeToggle" class="sp-card-content" ?hidden="\${!this.showDeviceThemeToggle_}">
|
||||
<div id="followThemeToggleTitle">$i18n{followThemeToggle}</div>
|
||||
- <cr-toggle id="followThemeToggleControl" title="$i18n{followThemeToggle}"
|
||||
- ?checked="\${!!this.theme_ && this.theme_.followDeviceTheme}"
|
||||
- @change="\${this.onFollowThemeToggleChange_}">
|
||||
+ <cr-toggle id="followThemeToggleControl" title="$i18n{followThemeToggle}" ?checked="\${!!this.theme_ && this.theme_.followDeviceTheme}" @change="\${this.onFollowThemeToggleChange_}">
|
||||
</cr-toggle>
|
||||
</div>
|
||||
-<customize-chrome-hover-button id=\\"setClassicChromeButton\\"
|
||||
- ?hidden=\\"\${!this.showClassicChromeButton_}\\"
|
||||
- label=\\"$i18n{resetToClassicChrome}\\"
|
||||
- @click=\\"\${this.onSetClassicChromeClick_}\\">
|
||||
+<customize-chrome-hover-button id=\\"setClassicChromeButton\\" ?hidden=\\"\${!this.showClassicChromeButton_}\\" label=\\"$i18n{resetToClassicChrome}\\" @click=\\"\${this.onSetClassicChromeClick_}\\">
|
||||
-<customize-chrome-hover-button id="setClassicChromeButton"
|
||||
- ?hidden="\${!this.showClassicChromeButton_}"
|
||||
- label="$i18n{resetToClassicChrome}"
|
||||
- @click="\${this.onSetClassicChromeClick_}">
|
||||
+<customize-chrome-hover-button id="setClassicChromeButton" ?hidden="\${!this.showClassicChromeButton_}" label="$i18n{resetToClassicChrome}" @click="\${this.onSetClassicChromeClick_}">
|
||||
</customize-chrome-hover-button>
|
||||
\${this.showManagedDialog_ ? html\`
|
||||
<managed-dialog @close=\\"\${this.onManagedDialogClose_}\\"
|
||||
title=\\"$i18n{managedColorsTitle}\\"
|
||||
body=\\"$i18n{managedColorsBody}\\">
|
||||
<managed-dialog @close="\${this.onManagedDialogClose_}"
|
||||
title="$i18n{managedColorsTitle}"
|
||||
body="$i18n{managedColorsBody}">
|
||||
</managed-dialog>
|
||||
\` : ''}
|
||||
-<!--_html_template_end_-->\`;
|
||||
+<!--_html_template_end_--><div id=\\"editButtonsContainer\\" ?hidden=\\"\${!this.showEditTheme_}\\">
|
||||
+ <cr-button id=\\"editThemeButton\\" @click=\\"\${this.onEditThemeClick_}\\" class=\\"floating-button\\">
|
||||
+ <div id=\\"editThemeIcon\\" class=\\"cr-icon edit-theme-icon\\" slot=\\"prefix-icon\\" ?hidden=\\"\${this.wallpaperSearchButtonEnabled_}\\"></div>
|
||||
+<!--_html_template_end_--><div id="editButtonsContainer" ?hidden="\${!this.showEditTheme_}">
|
||||
+ <cr-button id="editThemeButton" @click="\${this.onEditThemeClick_}" class="floating-button">
|
||||
+ <div id="editThemeIcon" class="cr-icon edit-theme-icon" slot="prefix-icon" ?hidden="\${this.wallpaperSearchButtonEnabled_}"></div>
|
||||
+ \${this.editThemeButtonText_}
|
||||
+ </cr-button>
|
||||
+ \${this.wallpaperSearchButtonEnabled_ ? html\`
|
||||
+ <cr-button id=\\"wallpaperSearchButton\\"
|
||||
+ @click=\\"\${this.onWallpaperSearchClick_}\\" class=\\"floating-button\\">
|
||||
+ <div id=\\"wallpaperSearchIcon\\" class=\\"cr-icon edit-theme-icon\\"
|
||||
+ slot=\\"prefix-icon\\"></div>
|
||||
+ <cr-button id="wallpaperSearchButton"
|
||||
+ @click="\${this.onWallpaperSearchClick_}" class="floating-button">
|
||||
+ <div id="wallpaperSearchIcon" class="cr-icon edit-theme-icon"
|
||||
+ slot="prefix-icon"></div>
|
||||
+ $i18n{wallpaperSearchTileLabel}
|
||||
+ </cr-button>
|
||||
+ \` : ''}
|
||||
@@ -428,55 +428,55 @@ exports[`mangled files should have up to date snapshots ./chromium_src/chrome/br
|
||||
|
||||
export function getHtml(this: ToolbarElement) {
|
||||
return html\`<!--_html_template_start_-->
|
||||
<div class=\\"sp-card\\">
|
||||
- <sp-heading id=\\"heading\\" @back-button-click=\\"\${this.onBackButtonClick_}\\"
|
||||
- back-button-aria-label=\\"$i18n{backButton}\\"
|
||||
- back-button-title=\\"$i18n{backButton}\\">
|
||||
- <h2 slot=\\"heading\\">$i18n{toolbarHeader}</h2>
|
||||
+ <sp-heading id=\\"heading\\" @back-button-click=\\"\${this.onBackButtonClick_}\\" back-button-aria-label=\\"$i18n{backButton}\\" back-button-title=\\"$i18n{backButton}\\" hide-back-button=\\"true\\">
|
||||
+ <close-panel-button id=\\"closeButton\\" iron-icon=\\"close\\" slot=\\"buttons\\"></close-panel-button>
|
||||
+ <h2 slot=\\"heading\\"><leo-icon name=\\"window-edit\\"></leo-icon>$i18n{toolbarHeader}</h2>
|
||||
<div class="sp-card">
|
||||
- <sp-heading id="heading" @back-button-click="\${this.onBackButtonClick_}"
|
||||
- back-button-aria-label="$i18n{backButton}"
|
||||
- back-button-title="$i18n{backButton}">
|
||||
- <h2 slot="heading">$i18n{toolbarHeader}</h2>
|
||||
+ <sp-heading id="heading" @back-button-click="\${this.onBackButtonClick_}" back-button-aria-label="$i18n{backButton}" back-button-title="$i18n{backButton}" hide-back-button="true">
|
||||
+ <close-panel-button id="closeButton" iron-icon="close" slot="buttons"></close-panel-button>
|
||||
+ <h2 slot="heading"><leo-icon name="window-edit"></leo-icon>$i18n{toolbarHeader}</h2>
|
||||
</sp-heading>
|
||||
- <div id=\\"miniToolbarBackground\\">
|
||||
- <svg id=\\"miniToolbar\\" src=\\"icons/mini_toolbar.svg\\">
|
||||
- <use href=\\"icons/mini_toolbar.svg#miniToolbar\\"></use>
|
||||
- <div id="miniToolbarBackground">
|
||||
- <svg id="miniToolbar" src="icons/mini_toolbar.svg">
|
||||
- <use href="icons/mini_toolbar.svg#miniToolbar"></use>
|
||||
- </svg>
|
||||
- </div>
|
||||
- <div class=\\"intro-text\\">$i18n{chooseToolbarIconsLabel}</div>
|
||||
- <cr-button id=\\"resetToDefaultButton\\" class=\\"floating-button\\"
|
||||
- @click=\\"\${this.onResetToDefaultClick_}\\"
|
||||
- ?disabled=\\"\${this.resetToDefaultDisabled_}\\">
|
||||
- <div id=\\"resetToDefaultIcon\\" class=\\"cr-icon\\" slot=\\"prefix-icon\\"></div>
|
||||
- <div class="intro-text">$i18n{chooseToolbarIconsLabel}</div>
|
||||
- <cr-button id="resetToDefaultButton" class="floating-button"
|
||||
- @click="\${this.onResetToDefaultClick_}"
|
||||
- ?disabled="\${this.resetToDefaultDisabled_}">
|
||||
- <div id="resetToDefaultIcon" class="cr-icon" slot="prefix-icon"></div>
|
||||
- $i18n{resetToDefaultButtonLabel}
|
||||
- </cr-button>
|
||||
+
|
||||
+
|
||||
+
|
||||
</div>
|
||||
+ <div class=\\"sp-card\\">
|
||||
+ <div class=\\"intro-text\\">$i18n{chooseToolbarIconsLabel}</div>
|
||||
+ <div id=\\"tipCardLabel\\">$i18n{reorderTipLabel}</div>
|
||||
+ <div class="sp-card">
|
||||
+ <div class="intro-text">$i18n{chooseToolbarIconsLabel}</div>
|
||||
+ <div id="tipCardLabel">$i18n{reorderTipLabel}</div>
|
||||
+
|
||||
+ </div>
|
||||
+
|
||||
<hr class=\\"sp-cards-separator\\">
|
||||
<div class=\\"sp-card\\" id=\\"pinningSelectionCard\\">
|
||||
<hr class="sp-cards-separator">
|
||||
<div class="sp-card" id="pinningSelectionCard">
|
||||
\${
|
||||
this.categories_.map(
|
||||
@@ -71,14 +67,12 @@
|
||||
categoryIndex !== this.categories_.length - 1 ?
|
||||
html\`<hr class=\\"sp-hr\\">\` :
|
||||
html\`<hr class="sp-hr">\` :
|
||||
''}
|
||||
\`)}
|
||||
-</div>
|
||||
+</div><cr-button id=\\"resetToDefaultButton\\" class=\\"floating-button\\" @click=\\"\${this.onResetToDefaultClick_}\\" ?disabled=\\"\${this.resetToDefaultDisabled_}\\">
|
||||
+ <div id=\\"resetToDefaultIcon\\" class=\\"cr-icon\\" slot=\\"prefix-icon\\"></div>
|
||||
+</div><cr-button id="resetToDefaultButton" class="floating-button" @click="\${this.onResetToDefaultClick_}" ?disabled="\${this.resetToDefaultDisabled_}">
|
||||
+ <div id="resetToDefaultIcon" class="cr-icon" slot="prefix-icon"></div>
|
||||
+ $i18n{resetToDefaultButtonLabel}
|
||||
+ </cr-button>
|
||||
<hr class=\\"sp-cards-separator\\">
|
||||
-<div class=\\"sp-card\\" id=\\"tipCard\\">
|
||||
- <svg id=\\"tipIcon\\" src=\\"icons/lightbulb_outline.svg\\">
|
||||
- <use href=\\"icons/lightbulb_outline.svg#lightbulbOutline\\"></use>
|
||||
<hr class="sp-cards-separator">
|
||||
-<div class="sp-card" id="tipCard">
|
||||
- <svg id="tipIcon" src="icons/lightbulb_outline.svg">
|
||||
- <use href="icons/lightbulb_outline.svg#lightbulbOutline"></use>
|
||||
- </svg>
|
||||
- $i18n{reorderTipLabel}
|
||||
-</div>
|
||||
@@ -494,62 +494,62 @@ exports[`mangled files should have up to date snapshots ./chromium_src/chrome/br
|
||||
|
||||
export function getHtml(this: ProfileCardElement) {
|
||||
return html\`<!--_html_template_start_-->
|
||||
<div id=\\"profileCardContainer\\">
|
||||
- <cr-button id=\\"profileCardButton\\" @click=\\"\${this.onProfileClick_}\\"
|
||||
- ?disabled=\\"\${this.disabled}\\"
|
||||
- aria-label=\\"\${this.profileState.profileCardButtonLabel}\\">
|
||||
+ <cr-button id=\\"profileCardButton\\" @click=\\"\${this.onProfileClick_}\\" ?disabled=\\"\${this.disabled}\\" aria-label=\\"\${this.profileState.profileCardButtonLabel}\\" class=\\"plain\\">
|
||||
<div id=\\"avatarContainer\\">
|
||||
<img class=\\"profile-avatar\\" alt=\\"\\" .src=\\"\${this.profileState.avatarIcon}\\">
|
||||
- <div id=\\"iconContainer\\"
|
||||
- ?hidden=\\"\${!this.profileState.avatarBadge.length}\\">
|
||||
+ <div id=\\"iconContainer\\" ?hidden=\\"\${!this.profileState.avatarBadge.length}\\">
|
||||
<cr-icon icon=\\"\${this.profileState.avatarBadge}\\"></cr-icon>
|
||||
<div id="profileCardContainer">
|
||||
- <cr-button id="profileCardButton" @click="\${this.onProfileClick_}"
|
||||
- ?disabled="\${this.disabled}"
|
||||
- aria-label="\${this.profileState.profileCardButtonLabel}">
|
||||
+ <cr-button id="profileCardButton" @click="\${this.onProfileClick_}" ?disabled="\${this.disabled}" aria-label="\${this.profileState.profileCardButtonLabel}" class="plain">
|
||||
<div id="avatarContainer">
|
||||
<img class="profile-avatar" alt="" .src="\${this.profileState.avatarIcon}">
|
||||
- <div id="iconContainer"
|
||||
- ?hidden="\${!this.profileState.avatarBadge.length}">
|
||||
+ <div id="iconContainer" ?hidden="\${!this.profileState.avatarBadge.length}">
|
||||
<cr-icon icon="\${this.profileState.avatarBadge}"></cr-icon>
|
||||
</div>
|
||||
</div>
|
||||
- <div id=\\"gaiaName\\" class=\\"profile-card-info secondary-text\\"
|
||||
- ?hidden=\\"\${this.profileState.needsSignin}\\">
|
||||
+ <div id=\\"gaiaName\\" class=\\"profile-card-info secondary-text\\" ?hidden=\\"\${this.profileState.needsSignin}\\">
|
||||
- <div id="gaiaName" class="profile-card-info secondary-text"
|
||||
- ?hidden="\${this.profileState.needsSignin}">
|
||||
+ <div id="gaiaName" class="profile-card-info secondary-text" ?hidden="\${this.profileState.needsSignin}">
|
||||
\${this.profileState.gaiaName}
|
||||
</div>
|
||||
- <div id=\\"forceSigninContainer\\" class=\\"profile-card-info secondary-text\\"
|
||||
- ?hidden=\\"\${!this.profileState.needsSignin}\\">
|
||||
+ <div id=\\"forceSigninContainer\\" class=\\"profile-card-info secondary-text\\" ?hidden=\\"\${!this.profileState.needsSignin}\\">
|
||||
- <div id="forceSigninContainer" class="profile-card-info secondary-text"
|
||||
- ?hidden="\${!this.profileState.needsSignin}">
|
||||
+ <div id="forceSigninContainer" class="profile-card-info secondary-text" ?hidden="\${!this.profileState.needsSignin}">
|
||||
<div>$i18n{needsSigninPrompt}</div>
|
||||
<cr-icon id=\\"forceSigninIcon\\" icon=\\"profiles:lock\\"></cr-icon>
|
||||
<cr-icon id="forceSigninIcon" icon="profiles:lock"></cr-icon>
|
||||
</div>
|
||||
</cr-button>
|
||||
<div id=\\"profileNameInputWrapper\\">
|
||||
- <cr-input class=\\"profile-card-info prominent-text\\" id=\\"nameInput\\"
|
||||
- aria-label=\\"$i18n{profileCardInputLabel}\\"
|
||||
- .value=\\"\${this.profileState.localProfileName}\\"
|
||||
- @change=\\"\${this.onProfileNameChange_}\\"
|
||||
- @keydown=\\"\${this.onProfileNameKeydown_}\\"
|
||||
- @blur=\\"\${this.onProfileNameInputBlur_}\\" pattern=\\"\${this.pattern_}\\"
|
||||
- auto-validate spellcheck=\\"false\\"
|
||||
- @pointerenter=\\"\${this.onNameInputPointerenter_}\\"
|
||||
- @pointerleave=\\"\${this.onNameInputPointerleave_}\\"
|
||||
- ?disabled=\\"\${
|
||||
- isGlicVersion() || this.profileState.hasEnterpriseLabel}\\" required>
|
||||
+ <cr-input class=\\"profile-card-info prominent-text\\" id=\\"nameInput\\" aria-label=\\"$i18n{profileCardInputLabel}\\" .value=\\"\${this.profileState.localProfileName}\\" @change=\\"\${this.onProfileNameChange_}\\" @keydown=\\"\${this.onProfileNameKeydown_}\\" @blur=\\"\${this.onProfileNameInputBlur_}\\" pattern=\\"\${this.pattern_}\\" auto-validate=\\"\\" spellcheck=\\"false\\" @pointerenter=\\"\${this.onNameInputPointerenter_}\\" @pointerleave=\\"\${this.onNameInputPointerleave_}\\" ?disabled=\\"\${
|
||||
+ isGlicVersion() || this.profileState.hasEnterpriseLabel}\\" required=\\"\\">
|
||||
<div id="profileNameInputWrapper">
|
||||
- <cr-input class="profile-card-info prominent-text" id="nameInput"
|
||||
- aria-label="$i18n{profileCardInputLabel}"
|
||||
- .value="\${this.profileState.localProfileName}"
|
||||
- @change="\${this.onProfileNameChange_}"
|
||||
- @keydown="\${this.onProfileNameKeydown_}"
|
||||
- @blur="\${this.onProfileNameInputBlur_}" pattern="\${this.pattern_}"
|
||||
- auto-validate spellcheck="false"
|
||||
- @pointerenter="\${this.onNameInputPointerenter_}"
|
||||
- @pointerleave="\${this.onNameInputPointerleave_}"
|
||||
- ?disabled="\${
|
||||
- isGlicVersion() || this.profileState.hasEnterpriseLabel}" required>
|
||||
+ <cr-input class="profile-card-info prominent-text" id="nameInput" aria-label="$i18n{profileCardInputLabel}" .value="\${this.profileState.localProfileName}" @change="\${this.onProfileNameChange_}" @keydown="\${this.onProfileNameKeydown_}" @blur="\${this.onProfileNameInputBlur_}" pattern="\${this.pattern_}" auto-validate="" spellcheck="false" @pointerenter="\${this.onNameInputPointerenter_}" @pointerleave="\${this.onNameInputPointerleave_}" ?disabled="\${
|
||||
+ isGlicVersion() || this.profileState.hasEnterpriseLabel}" required="">
|
||||
</cr-input>
|
||||
<div id=\\"hoverUnderline\\" ?hidden=\\"\${
|
||||
isGlicVersion() || this.profileState.hasEnterpriseLabel}\\"></div>
|
||||
<div id="hoverUnderline" ?hidden="\${
|
||||
isGlicVersion() || this.profileState.hasEnterpriseLabel}"></div>
|
||||
</div>
|
||||
- <profile-card-menu .profileState=\\"\${this.profileState}\\"
|
||||
- ?hidden=\\"\${isGlicVersion()}\\">
|
||||
+ <profile-card-menu .profileState=\\"\${this.profileState}\\" ?hidden=\\"\${isGlicVersion()}\\">
|
||||
- <profile-card-menu .profileState="\${this.profileState}"
|
||||
- ?hidden="\${isGlicVersion()}">
|
||||
+ <profile-card-menu .profileState="\${this.profileState}" ?hidden="\${isGlicVersion()}">
|
||||
</profile-card-menu>
|
||||
</div>
|
||||
-<cr-tooltip id=\\"gaiaNameTooltip\\" for=\\"gaiaName\\" manual-mode offset=\\"0\\"
|
||||
- position=\\"bottom\\" aria-hidden=\\"true\\">
|
||||
+<cr-tooltip id=\\"gaiaNameTooltip\\" for=\\"gaiaName\\" manual-mode=\\"\\" offset=\\"0\\" position=\\"bottom\\" aria-hidden=\\"true\\">
|
||||
-<cr-tooltip id="gaiaNameTooltip" for="gaiaName" manual-mode offset="0"
|
||||
- position="bottom" aria-hidden="true">
|
||||
+<cr-tooltip id="gaiaNameTooltip" for="gaiaName" manual-mode="" offset="0" position="bottom" aria-hidden="true">
|
||||
\${this.profileState.gaiaName}
|
||||
</cr-tooltip>
|
||||
-<cr-tooltip id=\\"tooltip\\" for=\\"nameInput\\" manual-mode offset=\\"-10\\"
|
||||
- aria-hidden=\\"true\\">
|
||||
+<cr-tooltip id=\\"tooltip\\" for=\\"nameInput\\" manual-mode=\\"\\" offset=\\"-10\\" aria-hidden=\\"true\\">
|
||||
-<cr-tooltip id="tooltip" for="nameInput" manual-mode offset="-10"
|
||||
- aria-hidden="true">
|
||||
+<cr-tooltip id="tooltip" for="nameInput" manual-mode="" offset="-10" aria-hidden="true">
|
||||
\${this.getNameInputTooltipText()}
|
||||
</cr-tooltip>
|
||||
<!--_html_template_end_-->\`;
|
||||
@@ -562,59 +562,59 @@ exports[`mangled files should have up to date snapshots ./chromium_src/chrome/br
|
||||
--- ../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
|
||||
@@ -10,10 +10,9 @@
|
||||
<link href=\\"glic_profile_branding.css\\" rel=\\"stylesheet\\" />
|
||||
<link href="glic_profile_branding.css" rel="stylesheet" />
|
||||
\` : ''}
|
||||
<div class=\\"flex-container\\">
|
||||
<div class=\\"title-container\\">
|
||||
- <img id=\\"pickerLogo\\" @click=\\"\${this.onProductLogoClick_}\\"
|
||||
- src=\\"picker_logo.svg\\" role=\\"presentation\\">
|
||||
+ <img id=\\"pickerLogo\\" @click=\\"\${this.onProductLogoClick_}\\" src=\\"picker_logo.svg\\" role=\\"presentation\\">
|
||||
<h1 class=\\"title\\" .innerHTML=\\"\${this.getTitle_()}\\"></h1>
|
||||
<div class=\\"subtitle\\" .innerHTML=\\"\${this.getSubtitle_()}\\"></div>
|
||||
<div class="flex-container">
|
||||
<div class="title-container">
|
||||
- <img id="pickerLogo" @click="\${this.onProductLogoClick_}"
|
||||
- src="picker_logo.svg" role="presentation">
|
||||
+ <img id="pickerLogo" @click="\${this.onProductLogoClick_}" src="picker_logo.svg" role="presentation">
|
||||
<h1 class="title" .innerHTML="\${this.getTitle_()}"></h1>
|
||||
<div class="subtitle" .innerHTML="\${this.getSubtitle_()}"></div>
|
||||
</div>
|
||||
<div id=\\"profilesWrapper\\" ?hidden=\\"\${(this.shouldHideProfilesWrapper_())}\\">
|
||||
<div id="profilesWrapper" ?hidden="\${(this.shouldHideProfilesWrapper_())}">
|
||||
@@ -24,40 +23,27 @@
|
||||
@toggle-drag=\\"\${this.onToggleDrag_}\\"
|
||||
@disable-all-picker-buttons=\\"\${this.onDisableAllPickerButtons_}\\">
|
||||
@toggle-drag="\${this.onToggleDrag_}"
|
||||
@disable-all-picker-buttons="\${this.onDisableAllPickerButtons_}">
|
||||
</profile-card>
|
||||
\`)}
|
||||
- <cr-button id=\\"addProfile\\" class=\\"profile-item\\"
|
||||
- @click=\\"\${this.onAddProfileClick_}\\"
|
||||
- ?hidden=\\"\${!this.profileCreationAllowed_}\\"
|
||||
- ?disabled=\\"\${this.pickerButtonsDisabled_}\\"
|
||||
- aria-labelledby=\\"addProfileButtonLabel\\">
|
||||
- <div id=\\"addProfileButtonLabel\\"
|
||||
- class=\\"profile-card-info prominent-text\\">
|
||||
+ <cr-button id=\\"addProfile\\" class=\\"profile-item plain\\" @click=\\"\${this.onAddProfileClick_}\\" ?hidden=\\"\${!this.profileCreationAllowed_}\\" ?disabled=\\"\${this.pickerButtonsDisabled_}\\" aria-labelledby=\\"addProfileButtonLabel\\">
|
||||
+ <div id=\\"addProfileButtonLabel\\" class=\\"profile-card-info prominent-text\\">
|
||||
- <cr-button id="addProfile" class="profile-item"
|
||||
- @click="\${this.onAddProfileClick_}"
|
||||
- ?hidden="\${!this.profileCreationAllowed_}"
|
||||
- ?disabled="\${this.pickerButtonsDisabled_}"
|
||||
- aria-labelledby="addProfileButtonLabel">
|
||||
- <div id="addProfileButtonLabel"
|
||||
- class="profile-card-info prominent-text">
|
||||
+ <cr-button id="addProfile" class="profile-item plain" @click="\${this.onAddProfileClick_}" ?hidden="\${!this.profileCreationAllowed_}" ?disabled="\${this.pickerButtonsDisabled_}" aria-labelledby="addProfileButtonLabel">
|
||||
+ <div id="addProfileButtonLabel" class="profile-card-info prominent-text">
|
||||
$i18n{addSpaceButton}
|
||||
</div>
|
||||
<cr-icon icon=\\"profiles:add\\"></cr-icon>
|
||||
<cr-icon icon="profiles:add"></cr-icon>
|
||||
</cr-button>
|
||||
</div>
|
||||
</div>
|
||||
- <div id=\\"footer-text\\" class=\\"subtitle\\"
|
||||
- ?hidden=\\"\${this.shouldHideFooterText_()}\\">
|
||||
+ <div id=\\"footer-text\\" class=\\"subtitle\\" ?hidden=\\"\${this.shouldHideFooterText_()}\\">
|
||||
- <div id="footer-text" class="subtitle"
|
||||
- ?hidden="\${this.shouldHideFooterText_()}">
|
||||
+ <div id="footer-text" class="subtitle" ?hidden="\${this.shouldHideFooterText_()}">
|
||||
$i18nRaw{glicAddProfileHelper}
|
||||
</div>
|
||||
</div>
|
||||
<div class=\\"footer\\">
|
||||
<div class=\\"footer-buttons-container\\">
|
||||
- <cr-button id=\\"browseAsGuestButton\\"
|
||||
- @click=\\"\${this.onLaunchGuestProfileClick_}\\"
|
||||
- ?hidden=\\"\${!this.guestModeEnabled_}\\"
|
||||
- ?disabled=\\"\${this.pickerButtonsDisabled_}\\">
|
||||
+ <cr-button id=\\"browseAsGuestButton\\" @click=\\"\${this.onLaunchGuestProfileClick_}\\" ?hidden=\\"\${!this.guestModeEnabled_}\\" ?disabled=\\"\${this.pickerButtonsDisabled_}\\">
|
||||
<cr-icon icon=\\"profiles:account-box\\" slot=\\"prefix-icon\\"></cr-icon>
|
||||
<div class="footer">
|
||||
<div class="footer-buttons-container">
|
||||
- <cr-button id="browseAsGuestButton"
|
||||
- @click="\${this.onLaunchGuestProfileClick_}"
|
||||
- ?hidden="\${!this.guestModeEnabled_}"
|
||||
- ?disabled="\${this.pickerButtonsDisabled_}">
|
||||
+ <cr-button id="browseAsGuestButton" @click="\${this.onLaunchGuestProfileClick_}" ?hidden="\${!this.guestModeEnabled_}" ?disabled="\${this.pickerButtonsDisabled_}">
|
||||
<cr-icon icon="profiles:account-box" slot="prefix-icon"></cr-icon>
|
||||
$i18n{browseAsGuestButton}
|
||||
</cr-button>
|
||||
- <cr-button id=\\"openAllProfilesButton\\"
|
||||
- class=\\"action-button\\"
|
||||
- @click=\\"\${this.onOpenAllProfilesClick_}\\"
|
||||
- ?hidden=\\"\${!this.shouldShowOpenAllProfilesButton_}\\"
|
||||
- ?disabled=\\"\${this.pickerButtonsDisabled_}\\">
|
||||
+ <cr-button id=\\"openAllProfilesButton\\" class=\\"action-button\\" @click=\\"\${this.onOpenAllProfilesClick_}\\" ?hidden=\\"\${!this.shouldShowOpenAllProfilesButton_}\\" ?disabled=\\"\${this.pickerButtonsDisabled_}\\">
|
||||
- <cr-button id="openAllProfilesButton"
|
||||
- class="action-button"
|
||||
- @click="\${this.onOpenAllProfilesClick_}"
|
||||
- ?hidden="\${!this.shouldShowOpenAllProfilesButton_}"
|
||||
- ?disabled="\${this.pickerButtonsDisabled_}">
|
||||
+ <cr-button id="openAllProfilesButton" class="action-button" @click="\${this.onOpenAllProfilesClick_}" ?hidden="\${!this.shouldShowOpenAllProfilesButton_}" ?disabled="\${this.pickerButtonsDisabled_}">
|
||||
$i18n{openAllProfilesButtonText}
|
||||
</cr-button>
|
||||
</div>
|
||||
@@ -636,13 +636,13 @@ exports[`mangled files should have up to date snapshots ./chromium_src/component
|
||||
<ul>
|
||||
\${this.webuiUrlInfos_.map(info => html\`
|
||||
\${this.isChromeUrlsUrl_(info) ?
|
||||
- html\`<li><a href=\\"#\\">chrome://chrome-urls</a></li>\` :
|
||||
+ html\`<li><a href=\\"#\\">brave://chrome-urls</a></li>\` :
|
||||
- html\`<li><a href="#">chrome://chrome-urls</a></li>\` :
|
||||
+ html\`<li><a href="#">brave://chrome-urls</a></li>\` :
|
||||
html\`\${info.enabled ?
|
||||
- html\`<li><a href=\\"\${info.url}\\">\${info.url}</a></li>\` :
|
||||
- html\`<li><a href="\${info.url}">\${info.url}</a></li>\` :
|
||||
- html\`<li>\${info.url}</li>\`
|
||||
+ html\`<li><a href=\\"\${info.url}\\">\${info.url.replace(/chrome:/, \\"brave:\\")}</a></li>\` :
|
||||
+ html\`<li>\${info.url.replace(/chrome:/, \\"brave:\\")}</li>\`
|
||||
+ html\`<li><a href="\${info.url}">\${info.url.replace(/chrome:/, "brave:")}</a></li>\` :
|
||||
+ html\`<li>\${info.url.replace(/chrome:/, "brave:")}</li>\`
|
||||
}\`
|
||||
}\`)}
|
||||
</ul>
|
||||
@@ -652,10 +652,10 @@ exports[`mangled files should have up to date snapshots ./chromium_src/component
|
||||
<ul>
|
||||
\${this.internalUrlInfos_.map(info => html\`
|
||||
\${this.isInternalUiEnabled_(info) ?
|
||||
- html\`<li><a href=\\"\${info.url}\\">\${info.url}</a></li>\` :
|
||||
- html\`<li><a href="\${info.url}">\${info.url}</a></li>\` :
|
||||
- html\`<li>\${info.url}</li>\`
|
||||
+ html\`<li><a href=\\"\${info.url}\\">\${info.url.replace(/chrome:/, \\"brave:\\")}</a></li>\` :
|
||||
+ html\`<li>\${info.url.replace(/chrome:/, \\"brave:\\")}</li>\`
|
||||
+ html\`<li><a href="\${info.url}">\${info.url.replace(/chrome:/, "brave:")}</a></li>\` :
|
||||
+ html\`<li>\${info.url.replace(/chrome:/, "brave:")}</li>\`
|
||||
}\`)}
|
||||
</ul>\` : ''}
|
||||
\${this.commandUrls_.length ? html\`
|
||||
@@ -666,7 +666,7 @@ exports[`mangled files should have up to date snapshots ./chromium_src/component
|
||||
</p>
|
||||
<ul>
|
||||
- \${this.commandUrls_.map(url => html\`<li>\${url}</li>\`)}
|
||||
+ \${this.commandUrls_.map(url => html\`<li>\${url.replace(/chrome:/, \\"brave:\\")}</li>\`)}
|
||||
+ \${this.commandUrls_.map(url => html\`<li>\${url.replace(/chrome:/, "brave:")}</li>\`)}
|
||||
</ul>\` : ''}\`;
|
||||
}
|
||||
"
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
"extends": "./tsconfig",
|
||||
"compilerOptions": {
|
||||
"isolatedModules": true,
|
||||
"module": "ESNext",
|
||||
"target": "ESNext",
|
||||
"esModuleInterop": true,
|
||||
|
||||
Reference in New Issue
Block a user