chrome-devtools-frontend 1.0.1646286 → 1.0.1649421

package/front_end/ui/legacy/components/cookie_table/CookiesTable.ts

@@ -50,8 +50,6 @@ import dataGridAiButtonStyles from '../data_grid/dataGridAiButton.css.js';
 
 import cookiesTableStyles from './cookiesTable.css.js';
 
-const STORAGE_FLOATING_BUTTON_ACTION_ID = 'ai-assistance.storage-floating-button';
-
 export interface ViewInput {
   data: CookieData[];
   selectedKey?: string;
@@ -176,6 +174,10 @@ const UIStrings = {
    * @description Text to be show in the Partition Key column in case it is an opaque origin.
    */
   opaquePartitionKey: '(opaque)',
+  /**
+   * @description Tooltip for the disabled AI button on HttpOnly cookies, explaining why they cannot be debugged.
+   */
+  httpOnlyCookiesCannotBeAdded: 'HttpOnly cookies cannot be added as context',
 } as const;
 const str_ = i18n.i18n.registerUIStrings('ui/legacy/components/cookie_table/CookiesTable.ts', UIStrings);
 const i18nString = i18n.i18n.getLocalizedString.bind(undefined, str_);
@@ -194,6 +196,10 @@ export class CookiesTable extends UI.Widget.VBox {
   #refreshCallback?: (() => void);
   #selectedCallback?: ((arg0: SDK.Cookie.Cookie|null) => void);
   #deleteCallback?: ((arg0: SDK.Cookie.Cookie, arg1: () => void) => void);
+  #aiButtonIsEnabled = false;
+  #onAiButtonClick?: (cookie: SDK.Cookie.Cookie, event: Event) => void;
+  #onPopulateAiContextMenu?: (cookie: SDK.Cookie.Cookie, contextMenu: UI.ContextMenu.ContextMenu) => void;
+  #aiButtonTitle?: string;
   private lastEditedColumnId: string|null;
   private data: CookieData[] = [];
   private cookies: SDK.Cookie.Cookie[] = [];
@@ -273,7 +279,9 @@ export class CookiesTable extends UI.Widget.VBox {
                    SourcePort
                 </th>` : ''}
               </tr>
-              ${repeat(this.data, cookie => cookie.key, cookie => html`
+              ${repeat(this.data, cookie => cookie.key, cookie => {
+                const isHttpOnly = cookie['http-only'] === 'true';
+                return html`
                 <tr ?selected=${cookie.key === input.selectedKey}
                     ?inactive=${cookie.inactive}
                     ?dirty=${cookie.dirty}
@@ -283,12 +291,13 @@ export class CookiesTable extends UI.Widget.VBox {
                     @delete=${()=> input.onDelete(cookie)}
                     @contextmenu=${(e: CustomEvent<UI.ContextMenu.ContextMenu>) => input.onContextMenu(cookie, e.detail)}
                     @select=${() => input.onSelect(cookie.key)}>
-                  <td>${input.showAiButton && !Boolean(cookie['http-only']) ? html`
+                  <td>${input.showAiButton ? html`
                       <span class="ai-button-container">
                         <devtools-floating-button
                           icon-name=${Root.Runtime.hostConfig.devToolsGeminiRebranding?.enabled ? 'spark' : 'smart-assistant'}
-                          title=${ifDefined(input.aiButtonTitle)}
-                          @click=${(e: Event) => input.onAiButtonClick?.(cookie, e)}
+                          title=${ifDefined(isHttpOnly ? i18nString(UIStrings.httpOnlyCookiesCannotBeAdded) : input.aiButtonTitle)}
+                          ?disabled=${isHttpOnly}
+                          @click=${(e: Event) => !isHttpOnly && input.onAiButtonClick?.(cookie, e)}
                         ></devtools-floating-button>
                       </span>
                     ` : nothing}${cookie.icons?.name}${cookie.name}</td>
@@ -297,7 +306,7 @@ export class CookiesTable extends UI.Widget.VBox {
                   <td>${cookie.icons?.path}${cookie.path}</td>
                   <td title=${ifDefined(cookie.expiresTooltip)}>${cookie.expires}</td>
                   <td>${cookie.size}</td>
-                  <td data-value=${Boolean(cookie['http-only'])}></td>
+                  <td data-value=${isHttpOnly}></td>
                   <td data-value=${Boolean(cookie.secure)}>${cookie.icons?.secure}</td>
                   <td>${cookie.icons?.['same-site']}${cookie['same-site']}</td>
                   <td>${cookie['partition-key-site']}</td>
@@ -307,7 +316,8 @@ export class CookiesTable extends UI.Widget.VBox {
                     <td title=${i18nString(UIStrings.sourceSchemeTooltip)}>${cookie['source-scheme']}</td>` : ''}
                   ${input.portBindingEnabled ? html`
                     <td title=${i18nString(UIStrings.sourcePortTooltip)}>${cookie['source-port']}</td>` : ''}
-                </tr>`)}
+                </tr>`;
+              })}
                 ${input.editable ? html`<tr placeholder><tr>` : ''}
               </table>
             </devtools-data-grid>`, target, {host: target});
@@ -363,6 +373,26 @@ export class CookiesTable extends UI.Widget.VBox {
     this.#selectedCallback = callback;
   }
 
+  set aiButtonIsEnabled(enabled: boolean) {
+    this.#aiButtonIsEnabled = enabled;
+  }
+
+  get aiButtonIsEnabled(): boolean {
+    return this.#aiButtonIsEnabled;
+  }
+
+  set onAiButtonClick(callback: (cookie: SDK.Cookie.Cookie, event: Event) => void) {
+    this.#onAiButtonClick = callback;
+  }
+
+  set onPopulateAiContextMenu(callback: (cookie: SDK.Cookie.Cookie, contextMenu: UI.ContextMenu.ContextMenu) => void) {
+    this.#onPopulateAiContextMenu = callback;
+  }
+
+  set aiButtonTitle(title: string|undefined) {
+    this.#aiButtonTitle = title;
+  }
+
   set deleteCallback(callback: (arg0: SDK.Cookie.Cookie, arg1: () => void) => void) {
     this.#deleteCallback = callback;
   }
@@ -407,6 +437,7 @@ export class CookiesTable extends UI.Widget.VBox {
   }
 
   override performUpdate(): void {
+    const onAiButtonClick = this.#onAiButtonClick;
     const input: ViewInput = {
       data: this.data,
       selectedKey: this.selectedKey,
@@ -420,19 +451,17 @@ export class CookiesTable extends UI.Widget.VBox {
       onDelete: this.onDeleteCookie.bind(this),
       onSelect: this.onSelect.bind(this),
       onContextMenu: this.populateContextMenu.bind(this),
-      showAiButton: this.isAiButtonEnabled(),
-      aiButtonTitle: this.isAiButtonEnabled() &&
-              UI.ActionRegistry.ActionRegistry.instance().hasAction(STORAGE_FLOATING_BUTTON_ACTION_ID) ?
-          UI.ActionRegistry.ActionRegistry.instance().getAction(STORAGE_FLOATING_BUTTON_ACTION_ID).title() :
+      showAiButton: this.#aiButtonIsEnabled,
+      aiButtonTitle: this.#aiButtonIsEnabled ? this.#aiButtonTitle : undefined,
+      onAiButtonClick: (this.#aiButtonIsEnabled && onAiButtonClick) ?
+          (cookieData: CookieData, event: Event) => {
+            event.stopPropagation();
+            const cookie = this.cookies.find(c => c.key() === cookieData.key);
+            if (cookie) {
+              onAiButtonClick(cookie, event);
+            }
+          } :
           undefined,
-      onAiButtonClick: (cookie: CookieData, event: Event) => {
-        event.stopPropagation();
-        this.onSelect(cookie.key);
-        const actionRegistry = UI.ActionRegistry.ActionRegistry.instance();
-        if (actionRegistry.hasAction(STORAGE_FLOATING_BUTTON_ACTION_ID)) {
-          void actionRegistry.getAction(STORAGE_FLOATING_BUTTON_ACTION_ID).execute();
-        }
-      },
     };
     const output = {};
     this.view(input, output, this.element);
@@ -443,10 +472,6 @@ export class CookiesTable extends UI.Widget.VBox {
     this.#selectedCallback?.(this.selectedCookie());
   }
 
-  private isAiButtonEnabled(): boolean {
-    return UI.ActionRegistry.ActionRegistry.instance().hasAction(STORAGE_FLOATING_BUTTON_ACTION_ID);
-  }
-
   private onDeleteCookie(data: CookieData): void {
     const cookie = this.cookies.find(cookie => cookie.key() === data.key);
     if (cookie && this.#deleteCallback) {
@@ -648,6 +673,7 @@ export class CookiesTable extends UI.Widget.VBox {
       return;
     }
     const cookie = maybeCookie;
+    this.#onPopulateAiContextMenu?.(cookie, contextMenu);
 
     contextMenu.revealSection().appendItem(i18nString(UIStrings.showRequestsWithThisCookie), () => {
       const requestFilter = NetworkForward.UIFilter.UIRequestFilter.filters([

package/front_end/ui/legacy/components/utils/Linkifier.ts

@@ -240,6 +240,7 @@ export class Linkifier extends Common.ObjectWrapper.ObjectWrapper<EventTypes> im
       userMetric: options?.userMetric,
       jslogContext: options?.jslogContext || 'script-location',
       omitOrigin: options?.omitOrigin,
+      allowPrivileged: options?.allowPrivileged,
     } satisfies LinkifyURLOptions;
     const {columnNumber, className = ''} = linkifyURLOptions;
     if (sourceURL) {
@@ -313,6 +314,7 @@ export class Linkifier extends Common.ObjectWrapper.ObjectWrapper<EventTypes> im
       tabStop: options?.tabStop,
       userMetric: options?.userMetric,
       jslogContext: options?.jslogContext || 'script-source-url',
+      allowPrivileged: options?.allowPrivileged,
     };
 
     return scriptLink || Linkifier.linkifyURL(sourceURL, linkifyURLOptions);
@@ -593,6 +595,8 @@ export class Linkifier extends Common.ObjectWrapper.ObjectWrapper<EventTypes> im
     const lineNumber = options.lineNumber;
     const columnNumber = options.columnNumber;
     const showColumnNumber = options.showColumnNumber;
+    const isPrivileged = Common.ParsedURL.schemeIs(url, 'chrome:') || Common.ParsedURL.schemeIs(url, 'file:') ||
+        Common.ParsedURL.schemeIs(url, 'devtools:');
     const preventClick = options.preventClick;
     const maxLength = options.maxLength || UI.UIUtils.MaxLengthForDisplayedURLs;
     const bypassURLTrimming = options.bypassURLTrimming;
@@ -629,6 +633,10 @@ export class Linkifier extends Common.ObjectWrapper.ObjectWrapper<EventTypes> im
         linkText += ':' + (columnNumber + 1);
       }
     }
+    if (isPrivileged && !options?.allowPrivileged) {
+      return html`<span class=${className}>${linkText}</span>`;
+    }
+
     const title = linkText !== url ? url : '';
     const linkOptions = {
       maxLength,
@@ -1170,6 +1178,7 @@ interface LinkInfo {
 }
 
 export interface LinkifyURLOptions {
+  allowPrivileged?: boolean;
   text?: string;
   className?: string;
   lineNumber?: number;
@@ -1187,6 +1196,7 @@ export interface LinkifyURLOptions {
 }
 
 export interface LinkifyOptions {
+  allowPrivileged?: boolean;
   className?: string;
   columnNumber?: number;
   showColumnNumber?: boolean;

package/front_end/ui/visual_logging/KnownContextValues.ts

@@ -17,8 +17,11 @@ export const knownContextValues = new Set([
   '%',
   '*',
   '-alternative-animation-with-timeline',
+  '-alternative-line-clamp-shorthand',
   '-alternative-position-try',
   '-alternative-webkit-line-clamp',
+  '-alternative-webkit-line-clamp-longhand',
+  '-alternative-webkit-line-clamp-shorthand',
   '-epub-caption-side',
   '-epub-text-combine',
   '-epub-text-emphasis',
@@ -1999,6 +2002,8 @@ export const knownContextValues = new Set([
   'i-pad-pro',
   'i-phone-12-pro',
   'i-phone-14-pro-max',
+  'i-phone-15-pro-max',
+  'i-phone-16-pro-max',
   'i-phone-se',
   'i-phone-xr',
   'icons',
@@ -2834,6 +2839,7 @@ export const knownContextValues = new Set([
   'network-show-blocked-cookies-only-setting',
   'network-show-settings-toolbar',
   'network-text-filter',
+  'network-track-widget',
   'network-web-socket-message-filter',
   'network.ad-blocking-enabled',
   'network.ad-blocking-enabled-true',
@@ -3069,7 +3075,11 @@ export const knownContextValues = new Set([
   'perspective-origin',
   'picture-in-picture',
   'ping',
+  'pixel-10',
   'pixel-7',
+  'pixel-8',
+  'pixel-9',
+  'pixel-9-pro-xl',
   'pl',
   'place-content',
   'place-items',
@@ -3157,6 +3167,7 @@ export const knownContextValues = new Set([
   'profile-view.focus-selected-function',
   'profile-view.restore-all-functions',
   'profile-view.selected-view',
+  'profiler',
   'profiler.clear-all',
   'profiler.delete-profile',
   'profiler.heap-snapshot-base',
@@ -3892,7 +3903,9 @@ export const knownContextValues = new Set([
   'storage',
   'storage-bucket',
   'storage-buckets',
+  'storage-cookie',
   'storage-default',
+  'storage-domstorage',
   'storage-items-view.clear-all',
   'storage-items-view.delete-selected',
   'storage-items-view.refresh',

package/package.json

@@ -92,5 +92,5 @@
     "webidl2": "24.5.0",
     "yargs": "17.7.2"
   },
-  "version": "1.0.1646286"
+  "version": "1.0.1649421"
 }