Remove the adorner from ToolbarButton, and its last client — last year's easter egg.

Bug: 301364727
Change-Id: I5295318d006b1b59c7645edd4470a6f129be38ad
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6387325
Commit-Queue: Danil Somsikov <[email protected]>
Reviewed-by: Jack Franklin <[email protected]>

Author: danilsomsikov

front_end/panels/timeline/TimelinePanel.ts

@@ -61,7 +61,6 @@ import * as AnnotationHelpers from './AnnotationHelpers.js';
 import {TraceLoadEvent} from './BenchmarkEvents.js';
 import * as TimelineComponents from './components/components.js';
 import * as TimelineInsights from './components/insights/insights.js';
-import {SHOULD_SHOW_EASTER_EGG} from './EasterEgg.js';
 import {Tracker} from './FreshRecording.js';
 import {IsolateSelector} from './IsolateSelector.js';
 import {AnnotationModifiedEvent, ModificationsManager} from './ModificationsManager.js';
@@ -413,8 +412,6 @@ export class TimelinePanel extends UI.Panel.Panel implements Client, TimelineMod
   private controller!: TimelineController|null;
   private cpuProfiler!: SDK.CPUProfilerModel.CPUProfilerModel|null;
   private clearButton!: UI.Toolbar.ToolbarButton;
-  private brickBreakerToolbarButton: UI.Toolbar.ToolbarButton;
-  private brickBreakerToolbarButtonAdded = false;
   private loadButton!: UI.Toolbar.ToolbarButton;
   private saveButton!: UI.Toolbar.ToolbarButton|UI.Toolbar.ToolbarMenuButton;
   private homeButton?: UI.Toolbar.ToolbarButton;
@@ -438,7 +435,6 @@ export class TimelinePanel extends UI.Panel.Panel implements Client, TimelineMod
   #sourceMapsResolver: Utils.SourceMapsResolver.SourceMapsResolver|null = null;
   #entityMapper: Utils.EntityMapper.EntityMapper|null = null;
   #onSourceMapsNodeNamesResolvedBound = this.#onSourceMapsNodeNamesResolved.bind(this);
-  readonly #onChartPlayableStateChangeBound: (event: Common.EventTarget.EventTargetEvent<boolean>) => void;
   #sidebarToggleButton = this.#splitWidget.createShowHideSidebarButton(
       i18nString(UIStrings.showSidebar),
       i18nString(UIStrings.hideSidebar),
@@ -507,10 +503,6 @@ export class TimelinePanel extends UI.Panel.Panel implements Client, TimelineMod
       name: i18nString(UIStrings.fixMe),
       content: adornerContent,
     };
-    this.brickBreakerToolbarButton = new UI.Toolbar.ToolbarButton(i18nString(UIStrings.fixMe), adorner);
-    this.brickBreakerToolbarButton.addEventListener(
-        UI.Toolbar.ToolbarButton.Events.CLICK, () => this.#onBrickBreakerEasterEggClick());
-
     this.#traceEngineModel = traceModel || this.#instantiateNewModel();
     this.#listenForProcessingProgress();
 
@@ -591,13 +583,9 @@ export class TimelinePanel extends UI.Panel.Panel implements Client, TimelineMod
         SDK.ResourceTreeModel.ResourceTreeModel, SDK.ResourceTreeModel.Events.Load, this.loadEventFired, this);
 
     this.flameChart = new TimelineFlameChartView(this);
-    this.#onChartPlayableStateChangeBound = this.#onChartPlayableStateChange.bind(this);
     this.element.addEventListener(
         'toggle-popover', event => this.flameChart.togglePopover((event as CustomEvent).detail));
 
-    this.flameChart.getMainFlameChart().addEventListener(
-        PerfUI.FlameChart.Events.CHART_PLAYABLE_STATE_CHANGED, this.#onChartPlayableStateChangeBound, this);
-
     this.#onMainEntryHovered = this.#onEntryHovered.bind(this, this.flameChart.getMainDataProvider());
     this.flameChart.getMainFlameChart().addEventListener(
         PerfUI.FlameChart.Events.ENTRY_HOVERED, this.#onMainEntryHovered);
@@ -929,10 +917,6 @@ export class TimelinePanel extends UI.Panel.Panel implements Client, TimelineMod
         // Whilst we don't reset this, we hide it, mainly so the user cannot
         // hit Ctrl/Cmd-F and try to search when it isn't visible.
         this.searchableViewInternal.hideWidget();
-
-        // Hide the brick-breaker easter egg
-        this.brickBreakerToolbarButtonAdded = false;
-        this.panelToolbar.removeToolbarItem(this.brickBreakerToolbarButton);
         return;
       }
 
@@ -1004,22 +988,6 @@ export class TimelinePanel extends UI.Panel.Panel implements Client, TimelineMod
     return data;
   }
 
-  #onChartPlayableStateChange(event: Common.EventTarget.EventTargetEvent<boolean, unknown>): void {
-    if (event.data) {
-      const dateObj = new Date();
-      const month = dateObj.getUTCMonth() + 1;
-      const day = dateObj.getUTCDate();
-      const isAprilFools = (month === 4 && (day === 1 || day === 2));  // Show only on April fools and the next day
-      if (isAprilFools && !this.brickBreakerToolbarButtonAdded && SHOULD_SHOW_EASTER_EGG) {
-        this.brickBreakerToolbarButtonAdded = true;
-        this.panelToolbar.appendToolbarItem(this.brickBreakerToolbarButton);
-      }
-    } else {
-      this.brickBreakerToolbarButtonAdded = false;
-      this.panelToolbar.removeToolbarItem(this.brickBreakerToolbarButton);
-    }
-  }
-
   #onEntryHovered(dataProvider: TimelineFlameChartDataProvider, event: Common.EventTarget.EventTargetEvent<number>):
       void {
     const entryIndex = event.data;
@@ -1898,13 +1866,6 @@ export class TimelinePanel extends UI.Panel.Panel implements Client, TimelineMod
     return this.#viewMode.mode === 'VIEWING_TRACE';
   }
 
-  #onBrickBreakerEasterEggClick(): void {
-    if (!this.#hasActiveTrace()) {
-      return;
-    }
-    this.flameChart.runBrickBreakerGame();
-  }
-
   #applyActiveFilters(traceIsGeneric: boolean, exclusiveFilter: Trace.Extras.TraceFilter.TraceFilter|null = null):
       void {
     if (traceIsGeneric || Root.Runtime.experiments.isEnabled('timeline-show-all-events')) {

front_end/ui/legacy/Toolbar.ts

@@ -34,7 +34,7 @@ import * as Platform from '../../core/platform/platform.js';
 import * as Root from '../../core/root/root.js';
 import * as Buttons from '../../ui/components/buttons/buttons.js';
 import * as VisualLogging from '../../ui/visual_logging/visual_logging.js';
-import * as Adorners from '../components/adorners/adorners.js';
+import type * as Adorners from '../components/adorners/adorners.js';
 import * as IconButton from '../components/icon_button/icon_button.js';
 
 import {type Action, Events as ActionEvents} from './ActionRegistration.js';
@@ -590,31 +590,21 @@ export class ToolbarButton extends ToolbarItem<ToolbarButton.EventTypes, Buttons
   private text?: string;
   private adorner?: HTMLElement;
 
-  constructor(
-      title: string, glyphOrAdorner?: string|Adorners.Adorner.Adorner, text?: string, jslogContext?: string,
-      button?: Buttons.Button.Button) {
-    let adorner: Adorners.Adorner.Adorner|null = null;
+  constructor(title: string, glyph?: string, text?: string, jslogContext?: string, button?: Buttons.Button.Button) {
     if (!button) {
       button = new Buttons.Button.Button();
-      if (glyphOrAdorner instanceof Adorners.Adorner.Adorner) {
-        button.variant = Buttons.Button.Variant.ADORNER_ICON;
-        adorner = glyphOrAdorner;
-      } else if (typeof glyphOrAdorner === 'string' && !text) {
-        button.data = {variant: Buttons.Button.Variant.ICON, iconName: glyphOrAdorner};
+      if (glyph && !text) {
+        button.data = {variant: Buttons.Button.Variant.ICON, iconName: glyph};
       } else {
         button.variant = Buttons.Button.Variant.TEXT;
         button.reducedFocusRing = true;
-        if (glyphOrAdorner) {
-          button.iconName = glyphOrAdorner;
+        if (glyph) {
+          button.iconName = glyph;
         }
       }
     }
     super(button);
     this.button = button;
-    if (adorner) {
-      this.setAdorner(adorner);
-      this.button.prepend(adorner);
-    }
     button.classList.add('toolbar-button');
     this.element.addEventListener('click', this.clicked.bind(this), false);
     button.textContent = text || '';