1 files changed, 19 insertions, 6 deletions
diff --git a/chromium/chrome/browser/resources/discards/discards.js b/chromium/chrome/browser/resources/discards/discards.js
index d28205475f0..b04312e2256 100644
--- a/chromium/chrome/browser/resources/discards/discards.js
+++ b/chromium/chrome/browser/resources/discards/discards.js
@@ -64,7 +64,8 @@ cr.define('discards', function() {
     }
 
     // Compares boolean fields.
-    if (['isMedia', 'isDiscarded', 'isAutoDiscardable'].includes(sortKey)) {
+    if (['isMedia', 'isFrozen', 'isDiscarded', 'isAutoDiscardable'].includes(
+            sortKey)) {
       if (val1 == val2)
         return 0;
       return val1 ? 1 : -1;
@@ -73,7 +74,11 @@ cr.define('discards', function() {
     // Compares numeric fields.
     // Note: Visibility is represented as a numeric value.
     if ([
-          'visibility', 'discardCount', 'utilityRank', 'lastActiveSeconds'
+          'visibility',
+          'discardCount',
+          'utilityRank',
+          'reactivationScore',
+          'lastActiveSeconds',
         ].includes(sortKey)) {
       return val1 - val2;
     }
@@ -254,8 +259,6 @@ cr.define('discards', function() {
     let lifecycleListener = function(e) {
       // Get the info backing this row.
       let info = infos[getRowIndex(e.target)];
-      // TODO(fmeawad): Disable the action, and let the update function
-      // re-enable it. Blocked on acquiring freeze status.
       // Perform the action.
       uiHandler.freezeById(info.id);
     };
@@ -274,14 +277,18 @@ cr.define('discards', function() {
     // Update the content.
     row.querySelector('.utility-rank-cell').textContent =
         info.utilityRank.toString();
-    row.querySelector('.favicon').src =
-        info.faviconUrl ? info.faviconUrl : 'chrome://favicon';
+    row.querySelector('.reactivation-score-cell').textContent =
+        info.hasReactivationScore ? info.reactivationScore.toFixed(4) : 'N/A';
+    row.querySelector('.favicon-div').style.backgroundImage =
+        cr.icon.getFavicon(info.tabUrl);
     row.querySelector('.title-div').textContent = info.title;
     row.querySelector('.tab-url-cell').textContent = info.tabUrl;
     row.querySelector('.visibility-cell').textContent =
         visibilityToString(info.visibility);
     row.querySelector('.is-media-cell').textContent =
         boolToString(info.isMedia);
+    row.querySelector('.is-frozen-cell').textContent =
+        boolToString(info.isFrozen);
     row.querySelector('.is-discarded-cell').textContent =
         boolToString(info.isDiscarded);
     row.querySelector('.discard-count-cell').textContent =
@@ -302,6 +309,12 @@ cr.define('discards', function() {
       discardLink.removeAttribute('disabled');
       discardUrgentLink.removeAttribute('disabled');
     }
+
+    let freezeLink = row.querySelector('.freeze-link');
+    if (info.isFrozen)
+      freezeLink.setAttribute('disabled', '');
+    else
+      freezeLink.removeAttribute('disabled', '');
   }
 
   /**