chrome-devtools-frontend 1.0.1672557 → 1.0.1674545

package/front_end/core/common/SettingRegistration.ts

@@ -4,7 +4,6 @@
 
 import * as i18n from '../i18n/i18n.js';
 import type * as Platform from '../platform/platform.js';
-import * as Root from '../root/root.js';
 
 import type {SettingStorageType} from './Settings.js';
 
@@ -78,10 +77,6 @@ const UIStrings = {
    * section allows users to see their signed-in account and configure which DevTools data is synced via Chrome Sync.
    */
   account: 'Account',
-  /**
-   * @description Title of the Privacy setting category.
-   */
-  privacy: 'Privacy',
 } as const;
 const str_ = i18n.i18n.registerUIStrings('core/common/SettingRegistration.ts', UIStrings);
 const i18nString = i18n.i18n.getLocalizedString.bind(undefined, str_);
@@ -98,7 +93,7 @@ export function registerSettingExtension(registration: SettingRegistration): voi
 }
 
 export function getRegisteredSettings(): SettingRegistration[] {
-  return registeredSettings.filter(setting => Root.Runtime.Runtime.isDescriptorEnabled(setting));
+  return registeredSettings;
 }
 
 export function registerSettingsForTest(settings: SettingRegistration[], forceReset = false): void {
@@ -149,7 +144,6 @@ export const enum SettingCategory {
   EXTENSIONS = 'EXTENSIONS',
   ADORNER = 'ADORNER',
   ACCOUNT = 'ACCOUNT',
-  PRIVACY = 'PRIVACY',
 }
 
 export function getLocalizedSettingsCategory(category: SettingCategory): Platform.UIString.LocalizedString {
@@ -192,8 +186,6 @@ export function getLocalizedSettingsCategory(category: SettingCategory): Platfor
       return i18n.i18n.lockedString('');
     case SettingCategory.ACCOUNT:
       return i18nString(UIStrings.account);
-    case SettingCategory.PRIVACY:
-      return i18nString(UIStrings.privacy);
   }
 }
 
@@ -268,19 +260,6 @@ export interface SettingRegistration {
    * Determines if the setting value is stored in the global, local or session storage.
    */
   storageType?: SettingStorageType;
-  /**
-   * A condition is a function that will make the setting available if it
-   * returns true, and not available, otherwise. Make sure that objects you
-   * access from inside the condition function are ready at the time when the
-   * setting conditions are checked.
-   */
-  condition?: Root.Runtime.Condition;
-
-  /**
-   * A function that returns true if the setting should be disabled, along with
-   * the reason why.
-   */
-  disabledCondition?: (config?: Root.Runtime.HostConfig) => DisabledConditionResult;
 
   /**
    * See {@link LearnMore} for more info.
@@ -319,7 +298,3 @@ interface RawSettingExtensionOption {
   raw: true;
 }
 export type SettingExtensionOption = LocalizedSettingExtensionOption|RawSettingExtensionOption;
-export type DisabledConditionResult = {
-  disabled: true,
-  reasons: Platform.UIString.LocalizedString[],
-}|{disabled: false};

package/front_end/core/common/Settings.ts

@@ -499,10 +499,7 @@ export class Setting<V> {
   #type: SettingType|null = null;
   #requiresUserAction?: boolean;
   #value?: V;
-  // TODO(crbug.com/1172300) Type cannot be inferred without changes to consumers. See above.
-  #serializer: Serializer<unknown, V> = JSON;
   #hadUserAction?: boolean;
-  #disabled?: boolean;
   #loggedInitialAccess = false;
   #logSettingAccess?: (name: string, value: number|string|boolean) => Promise<void>;
   readonly #console: Console;
@@ -515,10 +512,6 @@ export class Setting<V> {
     this.#logSettingAccess = logSettingAccess;
   }
 
-  setSerializer(serializer: Serializer<unknown, V>): void {
-    this.#serializer = serializer;
-  }
-
   descriptor(): SettingDescriptor<V> {
     return {
       name: this.name,
@@ -547,38 +540,11 @@ export class Setting<V> {
     this.#requiresUserAction = requiresUserAction;
   }
 
-  disabled(): boolean {
-    if (this.#registration?.disabledCondition) {
-      const {disabled} = this.#registration.disabledCondition(Root.Runtime.hostConfig);
-      // If registration does not disable it, pass through to #disabled
-      // attribute check.
-      if (disabled) {
-        return true;
-      }
-    }
-    return this.#disabled || false;
-  }
-
-  disabledReasons(): Platform.UIString.LocalizedString[] {
-    if (this.#registration?.disabledCondition) {
-      const result = this.#registration.disabledCondition(Root.Runtime.hostConfig);
-      if (result.disabled) {
-        return result.reasons;
-      }
-    }
-    return [];
-  }
-
-  setDisabled(disabled: boolean): void {
-    this.#disabled = disabled;
-    this.eventSupport.dispatchEventToListeners(this.name);
-  }
-
   #maybeLogAccess(value: V): void {
     try {
       const valueToLog = typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean' ?
           value :
-          this.#serializer?.stringify(value);
+          JSON.stringify(value);
       if (valueToLog !== undefined && this.#logSettingAccess) {
         void this.#logSettingAccess(this.name, valueToLog);
       }
@@ -607,7 +573,7 @@ export class Setting<V> {
     this.#value = this.defaultValue;
     if (this.storage.has(this.name)) {
       try {
-        this.#value = this.#serializer.parse(this.storage.get(this.name));
+        this.#value = JSON.parse(this.storage.get(this.name)) as V;
       } catch {
         this.storage.remove(this.name);
       }
@@ -616,16 +582,6 @@ export class Setting<V> {
     return this.#value;
   }
 
-  // Prefer this getter for settings which are "disableable". The plain getter returns `this.#value`,
-  // even if the setting is disabled, which means the callsite has to explicitly call the `disabled()`
-  // getter and add its own logic for the disabled state.
-  getIfNotDisabled(): V|undefined {
-    if (this.disabled()) {
-      return;
-    }
-    return this.get();
-  }
-
   async forceGet(): Promise<V> {
     const name = this.name;
     const oldValue = this.storage.get(name);
@@ -633,7 +589,7 @@ export class Setting<V> {
     this.#value = this.defaultValue;
     if (value) {
       try {
-        this.#value = this.#serializer.parse(value);
+        this.#value = JSON.parse(value) as V;
       } catch {
         this.storage.remove(this.name);
       }
@@ -652,7 +608,7 @@ export class Setting<V> {
     this.#hadUserAction = true;
     this.#value = value;
     try {
-      const settingString = this.#serializer.stringify(value);
+      const settingString = JSON.stringify(value);
       try {
         this.storage.set(this.name, settingString);
       } catch (e) {
@@ -822,11 +778,6 @@ export {
   SettingType,
 };
 
-export interface Serializer<I, O> {
-  stringify: (value: I) => string;
-  parse: (value: string) => O;
-}
-
 export interface SimpleSettingOption {
   value: string|boolean;
   title: string;