1 files changed, 79 insertions, 22 deletions

diff --git a/chromium/chrome/browser/resources/extensions/extensions.css b/chromium/chrome/browser/resources/extensions/extensions.css
index cedb2a15b7f..76d78e04b75 100644
--- a/chromium/chrome/browser/resources/extensions/extensions.css
+++ b/chromium/chrome/browser/resources/extensions/extensions.css
@@ -27,8 +27,7 @@ html:not(.focus-outline-visible)
   overflow: hidden;
 }
 
-#dev-controls .buttons-container,
-#apps-dev-tool-banner {
+#dev-controls .buttons-container {
   -webkit-padding-end: 3px;
   -webkit-padding-start: 4px;
 }
@@ -42,30 +41,55 @@ html:not(.focus-outline-visible)
   white-space: nowrap;
 }
 
-#extension-settings.dev-mode #dev-controls {
-  -webkit-transition-duration: 250ms;
-  height: 45px;
-  opacity: 1;
-  padding-bottom: 7px;
+#apps-developer-tools-promo {
+  -webkit-margin-before: 15px;
+  -webkit-padding-before: 5px;
+  -webkit-padding-end: 3px;
+  align-items: center;
+  border-top: 1px solid #eee;
+  display: flex;
+  font-size: 13px;
 }
 
-#extension-settings.dev-mode.apps-dev-tools-mode #dev-controls {
-  height: 100px;
+#apps-developer-tools-promo img {
+  content: url(apps_developer_tools_promo_48.png);
 }
 
-#apps-dev-tool-banner {
-  border-bottom: 1px solid #eee;
-  display: none;
-  padding-bottom: 13px;
-  padding-top: 13px;
+#apps-developer-tools-promo-text {
+  -webkit-margin-start: 5px;
 }
 
-#extension-settings.dev-mode.apps-dev-tools-mode #apps-dev-tool-banner {
-  display: -webkit-box;
+#apps-developer-tools-promo-close-wrapper {
+  display: flex;
+  flex-grow: 1;
+  justify-content: flex-end;
 }
 
-.apps-dev-tool-banner-text {
-  -webkit-box-flex: 1;
+#apps-developer-tools-promo .close-button {
+  background: url(chrome://theme/IDR_CLOSE_DIALOG) no-repeat center center;
+  border: 0;
+  height: 14px;
+  width: 14px;
+  z-index: 1;
+}
+
+#apps-developer-tools-promo .close-button:hover {
+  background-image: url(chrome://theme/IDR_CLOSE_DIALOG_H);
+}
+
+#apps-developer-tools-promo .close-button:active {
+  background-image: url(chrome://theme/IDR_CLOSE_DIALOG_P);
+}
+
+#extension-settings.dev-mode #dev-controls {
+  -webkit-transition-duration: 250ms;
+  height: 45px;
+  opacity: 1;
+  padding-bottom: 7px;
+}
+
+#extension-settings.dev-mode.adt-promo #dev-controls {
+  height: 105px;  /* Allow more height for the Apps Developer Tools promo. */
 }
 
 #dev-controls-spacer {
@@ -77,6 +101,27 @@ html:not(.focus-outline-visible)
   text-align: end;
 }
 
+.extension-code {
+  border: 1px solid #ccc;
+  display: flex;
+  font-family: monospace;
+  overflow: auto;
+  white-space: pre;
+}
+
+.extension-code > * {
+  padding: 3px;
+}
+
+.extension-code-line-numbers {
+  align-self: flex-start;
+  background-color: rgba(240, 240, 240, 1);
+  border-right: 1px solid #ccc;
+  color: rgba(128, 128, 128, 1);
+  flex-shrink: 0;
+  text-align: right;
+}
+
 #extension-settings:not(.dev-mode) .developer-extras {
   display: none;
 }
@@ -107,12 +152,13 @@ html:not(.focus-outline-visible)
 }
 
 #footer-section {
-  background: url('chrome://theme/IDR_WEBSTORE_ICON_32') no-repeat left center;
+  background: url(chrome://theme/IDR_WEBSTORE_ICON_32) no-repeat left center;
+  background-size: 32px 32px;
   font-size: 1.25em;
 }
 
 html[dir=rtl] #footer-section {
-  background: url('chrome://theme/IDR_WEBSTORE_ICON_32') no-repeat right center;
+  background: url(chrome://theme/IDR_WEBSTORE_ICON_32) no-repeat right center;
 }
 
 #footer-section > a {
@@ -177,6 +223,7 @@ html[dir='rtl'] .extension-list-item {
 .extension-description,
 .extension-list-item-wrapper.inactive-extension .extension-details,
 .location-text,
+.blacklist-text,
 .enable-checkbox input:disabled + .enable-checkbox-text {
   color: rgb(151, 156, 160);
 }
@@ -247,6 +294,15 @@ html[dir='rtl'] .extension-list-item {
   margin: 0;
 }
 
+.error-collection-control {
+  -webkit-margin-start: 5px;
+  display: none;
+}
+
+#extension-settings.dev-mode .error-collection-control {
+  display: initial;
+}
+
 #font-measuring-div {
   /* Remove from the flow and hide. */
   position: absolute;
@@ -281,7 +337,8 @@ html[dir=rtl] .extension-commands-config {
   margin: 1em;
 }
 
-.location-text {
+.location-text,
+.blacklist-text {
   display: block;
   width: 100px;
 }
@@ -331,7 +388,7 @@ html[dir='rtl'] #extension-settings .trash {
 }
 
 .profile-is-managed-banner .page-banner-text {
-  background-image: url('chrome://theme/IDR_WARNING');
+  background-image: url(chrome://theme/IDR_WARNING);
 }
 
 /* Sideload Wipeout */