Skip to content

Commit 6803e2c

Browse files
Duong DacDevtools-frontend LUCI CQ
authored andcommitted
[UNO-d] Remove sync references in devtools strings
Preferences can now be saved to Google account for signed-in users without enabling Chrome Sync on Win/Mac/Linux (crrev.com/c/6239792, ChromeOS experiment is in progress). That is, `arePreferencesSynced` can be true with `isSyncActive` false. Meanwhile, users cannot toggle devtools settings sync if either `isSyncActive` or `arePreferencesSynced` is false. Since the `isSyncActive` condition is redundant on applicable platforms, we will default `isSyncActive` to true in crrev.com/c/6965039. Setting sync toggle-ability should then only depend on `arePreferencesSynced`.. Eventually, the current Sync model will be deprecated. This CL updates the strings accordingly. Bug: 441694920 Change-Id: Ib78fc28e922b26d3cc78eb8b2e57d50bae5e44c8 Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6956108 Reviewed-by: Wolfgang Beyer <[email protected]> Commit-Queue: Duong Dac <[email protected]> Reviewed-by: Ergün Erdoğmuş <[email protected]>
1 parent 2b6d68f commit 6803e2c

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

front_end/entrypoints/main/main-meta.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,9 +188,9 @@ const UIStrings = {
188188
browserLanguage: 'Browser UI language',
189189
/**
190190
* @description Label for a checkbox in the settings UI. Allows developers to opt-in/opt-out
191-
* of syncing DevTools settings via Chrome Sync.
191+
* of saving settings to their Google account.
192192
*/
193-
enableSync: 'Enable settings sync',
193+
saveSettings: 'Save `DevTools` settings to your `Google` account',
194194
/**
195195
* @description Label for a checkbox in the settings UI. Allows developers to opt-in/opt-out
196196
* of receiving Google Developer Program (GDP) badges based on their activity in Chrome DevTools.
@@ -789,7 +789,7 @@ Common.Settings.registerSettingExtension({
789789
// This name must be kept in sync with DevToolsSettings::kSyncDevToolsPreferencesFrontendName.
790790
settingName: 'sync-preferences',
791791
settingType: Common.Settings.SettingType.BOOLEAN,
792-
title: i18nLazyString(UIStrings.enableSync),
792+
title: i18nLazyString(UIStrings.saveSettings),
793793
defaultValue: false,
794794
reloadRequired: true,
795795
});

front_end/panels/settings/components/SyncSection.test.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,7 @@ describeWithLocale('SyncSection', () => {
7070

7171
const warning = shadowRoot.querySelector('devtools-tooltip');
7272
assert.instanceOf(warning, HTMLElement);
73-
74-
assert.include(warning.innerText, 'To turn this setting on');
73+
assert.include(warning.innerText, 'You need to first enable saving Chrome settings in your Google account.');
7574
});
7675

7776
it('disables the checkbox when sync is not active', async () => {

front_end/panels/settings/components/SyncSection.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ const UIStrings = {
3131
*/
3232
syncDisabled: 'To turn this setting on, you must enable Chrome sync.',
3333
/**
34-
* @description Text shown to the user in the Settings UI. 'This setting' refers
35-
* to a checkbox that is disabled.
34+
* @description Text shown to the user in the Settings UI. Explains why the checkbox
35+
* for saving DevTools settings to the user's Google account is inactive.
3636
*/
37-
preferencesSyncDisabled: 'To turn this setting on, you must first enable settings sync in Chrome.',
37+
preferencesSyncDisabled: 'You need to first enable saving `Chrome` settings in your `Google` account.',
3838
/**
3939
* @description Label for the account email address. Shown in the DevTools Settings UI in
4040
* front of the email address currently used for Chrome Sync.

0 commit comments

Comments
 (0)