BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
author: Allan Sandfeld Jensen <allan.jensen@qt.io> 2020-10-12 14:27:29 +0200
committer: Allan Sandfeld Jensen <allan.jensen@qt.io> 2020-10-13 09:35:20 +0000
commit: c30a6232df03e1efbd9f3b226777b07e087a1122 (patch)
tree: e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/chrome/browser/resources/extensions
parent: 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff)
8 files changed, 15 insertions, 45 deletions
diff --git a/chromium/chrome/browser/resources/extensions/BUILD.gn b/chromium/chrome/browser/resources/extensions/BUILD.gn
index 6ad3d269eb8..53ed19cc2b6 100644
--- a/chromium/chrome/browser/resources/extensions/BUILD.gn
+++ b/chromium/chrome/browser/resources/extensions/BUILD.gn
@@ -378,12 +378,12 @@ js_library("service") {
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:cr.m",
   ]
-  externs_list = [
-    "$externs_path/activity_log_private.js",
-    "$externs_path/developer_private.js",
-    "$externs_path/management.js",
-    "$externs_path/metrics_private.js",
-  ]
+  externs_list = chrome_extension_public_externs + [
+                   "$externs_path/activity_log_private.js",
+                   "$externs_path/developer_private.js",
+                   "$externs_path/management.js",
+                   "$externs_path/metrics_private.js",
+                 ]
 }
 
 js_library("shortcut_input") {
diff --git a/chromium/chrome/browser/resources/extensions/detail_view.html b/chromium/chrome/browser/resources/extensions/detail_view.html
index 2e647218766..04c47dbf7cc 100644
--- a/chromium/chrome/browser/resources/extensions/detail_view.html
+++ b/chromium/chrome/browser/resources/extensions/detail_view.html
@@ -401,7 +401,7 @@
       </div>
     </div>
     <cr-link-row class="hr" id="remove-extension"
-        hidden="[[isControlled_(data.controlledInfo)]]"
+        hidden="[[data.mustRemainInstalled]]"
         label="$i18n{itemRemoveExtension}" on-click="onRemoveTap_">
     </cr-link-row>
   </div>
diff --git a/chromium/chrome/browser/resources/extensions/detail_view.js b/chromium/chrome/browser/resources/extensions/detail_view.js
index eb337947210..fc461db137c 100644
--- a/chromium/chrome/browser/resources/extensions/detail_view.js
+++ b/chromium/chrome/browser/resources/extensions/detail_view.js
@@ -31,7 +31,7 @@ import {afterNextRender, html, Polymer} from 'chrome://resources/polymer/v3_0/po
 
 import {ItemDelegate} from './item.js';
 import {ItemBehavior} from './item_behavior.js';
-import {computeInspectableViewLabel, EnableControl, getEnableControl, getItemSource, getItemSourceString, isControlled, isEnabled, userCanChangeEnablement} from './item_util.js';
+import {computeInspectableViewLabel, EnableControl, getEnableControl, getItemSource, getItemSourceString, isEnabled, userCanChangeEnablement} from './item_util.js';
 import {navigation, Page} from './navigation_helper.js';
 
 Polymer({
@@ -132,14 +132,6 @@ Polymer({
    * @return {boolean}
    * @private
    */
-  isControlled_() {
-    return isControlled(this.data);
-  },
-
-  /**
-   * @return {boolean}
-   * @private
-   */
   isEnabled_() {
     return isEnabled(this.data.state);
   },
@@ -321,8 +313,6 @@ Polymer({
     switch (type) {
       case 'POLICY':
         return 'cr20:domain';
-      case 'SUPERVISED_USER_CUSTODIAN':
-        return 'cr:supervisor-account';
       default:
         return '';
     }
diff --git a/chromium/chrome/browser/resources/extensions/extensions.html b/chromium/chrome/browser/resources/extensions/extensions.html
index 087a92fd887..c5980f41fd1 100644
--- a/chromium/chrome/browser/resources/extensions/extensions.html
+++ b/chromium/chrome/browser/resources/extensions/extensions.html
@@ -1,6 +1,6 @@
 <!doctype html>
 <html dir="$i18n{textdirection}" lang="$i18n{language}"
-    class="loading $i18n{loadTimeClasses}" $i18n{a11yenhanced}>
+    class="loading $i18n{loadTimeClasses}">
 <head>
   <meta charset="utf8">
   <title>$i18n{title}</title>
diff --git a/chromium/chrome/browser/resources/extensions/extensions_resources_vulcanized.grd b/chromium/chrome/browser/resources/extensions/extensions_resources_vulcanized.grd
index 3ebe27cf553..6ef33b79788 100644
--- a/chromium/chrome/browser/resources/extensions/extensions_resources_vulcanized.grd
+++ b/chromium/chrome/browser/resources/extensions/extensions_resources_vulcanized.grd
@@ -14,22 +14,18 @@
     <includes>
       <include name="IDR_EXTENSIONS_EXTENSIONS_HTML"
                file="extensions.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
       <include name="IDR_EXTENSIONS_EXTENSIONS_ROLLUP_JS"
                file="${root_gen_dir}\chrome\browser\resources\extensions\extensions.rollup.js"
                use_base_dir="false"
                preprocess="true"
-               type="BINDATA"
-               compress="gzip" />
+               type="BINDATA" />
       <include name="IDR_EXTENSIONS_CHECKUP_IMAGE"
                file="checkup_image.svg"
-               type="BINDATA"
-               compress="gzip" />
+               type="BINDATA" />
       <include name="IDR_EXTENSIONS_CHECKUP_IMAGE_DARK"
                file="checkup_image_dark.svg"
-               type="BINDATA"
-               compress="gzip" />
+               type="BINDATA" />
     </includes>
   </release>
 </grit>
diff --git a/chromium/chrome/browser/resources/extensions/item.html b/chromium/chrome/browser/resources/extensions/item.html
index 712997e330d..fb2f6d20bdb 100644
--- a/chromium/chrome/browser/resources/extensions/item.html
+++ b/chromium/chrome/browser/resources/extensions/item.html
@@ -279,7 +279,7 @@
       </cr-button>
       <cr-button id="remove-button" on-click="onRemoveTap_"
           aria-describedby="a11yAssociation"
-          hidden="[[isControlled_(data.controlledInfo)]]">
+          hidden="[[data.mustRemainInstalled]]">
         $i18n{remove}
       </cr-button>
       <template is="dom-if" if="[[shouldShowErrorsButton_(data.*)]]">
diff --git a/chromium/chrome/browser/resources/extensions/item.js b/chromium/chrome/browser/resources/extensions/item.js
index fb88800bb62..51eb641791c 100644
--- a/chromium/chrome/browser/resources/extensions/item.js
+++ b/chromium/chrome/browser/resources/extensions/item.js
@@ -27,7 +27,7 @@ import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js';
 import {flush, html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 import {ItemBehavior} from './item_behavior.js';
-import {computeInspectableViewLabel, EnableControl, getEnableControl, getItemSource, getItemSourceString, isControlled, isEnabled, SourceType, userCanChangeEnablement} from './item_util.js';
+import {computeInspectableViewLabel, EnableControl, getEnableControl, getItemSource, getItemSourceString, isEnabled, SourceType, userCanChangeEnablement} from './item_util.js';
 import {navigation, Page} from './navigation_helper.js';
 
 /** @interface */
@@ -276,14 +276,6 @@ Polymer({
    * @return {boolean}
    * @private
    */
-  isControlled_() {
-    return isControlled(this.data);
-  },
-
-  /**
-   * @return {boolean}
-   * @private
-   */
   isEnabled_() {
     return isEnabled(this.data.state);
   },
diff --git a/chromium/chrome/browser/resources/extensions/item_util.js b/chromium/chrome/browser/resources/extensions/item_util.js
index a1f91b53f7e..83e727c2641 100644
--- a/chromium/chrome/browser/resources/extensions/item_util.js
+++ b/chromium/chrome/browser/resources/extensions/item_util.js
@@ -44,14 +44,6 @@ export function isEnabled(state) {
 }
 
 /**
- * @param {!chrome.developerPrivate.ExtensionInfo} extensionInfo
- * @return {boolean} Whether the extension is controlled.
- */
-export function isControlled(extensionInfo) {
-  return !!extensionInfo.controlledInfo;
-}
-
-/**
  * Returns true if the user can change whether or not the extension is
  * enabled.
  * @param {!chrome.developerPrivate.ExtensionInfo} item
author	Allan Sandfeld Jensen <allan.jensen@qt.io>	2020-10-12 14:27:29 +0200
committer	Allan Sandfeld Jensen <allan.jensen@qt.io>	2020-10-13 09:35:20 +0000
commit	c30a6232df03e1efbd9f3b226777b07e087a1122 (patch)
tree	e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/chrome/browser/resources/extensions
parent	7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff)