[Signin]: Use the shared icons file instead of 'signin_icons'.

This CL deletes 'signin_icons' and replaces all usage of
'signin:business' with 'cr:domain'.

Change-Id: Ifa234f23af00f0d45e2b528ad4b1d37f3568f2fa
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2490045Reviewed-by: David Roger <droger@chromium.org>
Reviewed-by: dpapad <dpapad@chromium.org>
Commit-Queue: Monica Basta <msalama@chromium.org>
Cr-Commit-Position: refs/heads/master@{#819817}

chrome/browser/browser_resources.grd

@@ -9,7 +9,6 @@
   <release seq="1">
     <structures>
       <if expr="is_win or is_macosx or desktop_linux or chromeos">
-        <structure name="IDR_SIGNIN_ICONS_JS" file="resources\signin\signin_icons.js" type="chrome_html" />
         <structure name="IDR_SIGNIN_SHARED_CSS_JS" file="${root_gen_dir}\chrome\browser\resources\signin\signin_shared_css.js" use_base_dir="false" preprocess="true" type="chrome_html" />
         <structure name="IDR_SIGNIN_VARS_CSS_JS" file="${root_gen_dir}\chrome\browser\resources\signin\signin_vars_css.js" use_base_dir="false" type="chrome_html" />
       </if>

chrome/browser/resources/signin/dice_web_signin_intercept/dice_web_signin_intercept_app.html

@@ -103,7 +103,7 @@
         src="[[interceptionParameters_.interceptedAccount.pictureUrl]]">
     <div class="work-badge" id="badge"
         hidden="[[!interceptionParameters_.interceptedAccount.isManaged]]">
-      <iron-icon class="icon" icon="signin:business"></iron-icon>
+      <iron-icon class="icon" icon="cr:domain"></iron-icon>
     </div>
   </div>
 </div>

chrome/browser/resources/signin/dice_web_signin_intercept/dice_web_signin_intercept_app.js

@@ -4,7 +4,7 @@
 
 import 'chrome://resources/cr_elements/cr_button/cr_button.m.js';
 import 'chrome://resources/polymer/v3_0/iron-icon/iron-icon.js';
-import './signin_icons.js';
+import 'chrome://resources/cr_elements/icons.m.js';
 import './signin_shared_css.js';
 import './signin_vars_css.js';
 

chrome/browser/resources/signin/profile_customization/profile_customization_app.html

@@ -124,7 +124,7 @@
   <div id="avatarContainer">
     <img id="avatar" src="[[pictureUrl_]]">
     <div class="work-badge" id="badge" hidden="[[!isManaged_]]">
-      <iron-icon class="icon" icon="signin:business"></iron-icon>
+      <iron-icon class="icon" icon="cr:domain"></iron-icon>
     </div>
   </div>
 </div>

chrome/browser/resources/signin/profile_customization/profile_customization_app.js

@@ -6,8 +6,8 @@ import 'chrome://resources/cr_components/customize_themes/customize_themes.js';
 import 'chrome://resources/cr_elements/cr_button/cr_button.m.js';
 import 'chrome://resources/cr_elements/cr_input/cr_input.m.js';
 import 'chrome://resources/polymer/v3_0/iron-icon/iron-icon.js';
+import 'chrome://resources/cr_elements/icons.m.js';
 import './strings.m.js';
-import './signin_icons.js';
 import './signin_shared_css.js';
 import './signin_vars_css.js';
 

chrome/browser/resources/signin/profile_picker/BUILD.gn

@@ -12,7 +12,6 @@ import("../../optimize_webui.gni")
 preprocess_folder = "preprocessed"
 preprocess_manifest = "preprocessed_manifest.json"
 preprocess_gen_manifest = "preprocessed_gen_manifest.json"
-preprocess_shared_manifest = "preprocessed_shared_manifest.json"
 
 if (optimize_webui) {
   build_manifest = "build_manifest.json"
@@ -34,7 +33,6 @@ if (optimize_webui) {
     deps = [
       ":preprocess",
       ":preprocess_generated",
-      ":shared",
       "../../../../../ui/webui/resources:preprocess",
     ]
     excludes = [
@@ -70,12 +68,10 @@ generate_grd("build_grd") {
     deps = [
       ":preprocess",
       ":preprocess_generated",
-      ":shared",
     ]
     manifest_files = [
       "$target_gen_dir/$preprocess_manifest",
       "$target_gen_dir/$preprocess_gen_manifest",
-      "$target_gen_dir/$preprocess_shared_manifest",
     ]
   }
 }
@@ -95,13 +91,6 @@ preprocess_grit("preprocess") {
   ]
 }
 
-preprocess_grit("shared") {
-  in_folder = "../"
-  out_folder = "$target_gen_dir/$preprocess_folder"
-  out_manifest = "$target_gen_dir/$preprocess_shared_manifest"
-  in_files = [ "signin_icons.js" ]
-}
-
 preprocess_grit("preprocess_generated") {
   deps = [ ":web_components" ]
   in_folder = target_gen_dir

chrome/browser/resources/signin/profile_picker/profile_card.html

@@ -28,22 +28,23 @@
   }
 
   #iconContainer {
-    --iron-icon-height: 18px;
-    --iron-icon-width: 24px;
-    --business-icon-size: 24px;
-    --business-icon-border-size: 2px;
+    --iron-icon-height: 16px;
+    --iron-icon-width: 16px;
+    --domain-icon-size: 24px;
+    --domain-icon-border-size: 2px;
     align-items: center;
     background-color: white;
-    border: var(--business-icon-border-size) solid var(--card-background-color);
+    border: var(--domain-icon-border-size) solid var(--card-background-color);
     border-radius: 50%;
     box-shadow: 0 0 2px rgba(60, 64, 67, 0.12), 0 0 6px rgba(60, 64, 67, 0.15);
     display: flex;
-    height: var(--business-icon-size);
+    justify-content: center;
+    height: var(--domain-icon-size);
     position: absolute;
     right: -6px;
-    top: calc(var(--avatar-icon-size) - var(--business-icon-size)
-      - var(--business-icon-border-size));
-    width: var(--business-icon-size);
+    top: calc(var(--avatar-icon-size) - var(--domain-icon-size)
+      - var(--domain-icon-border-size));
+    width: var(--domain-icon-size);
   }
 
   :host-context([dir='rtl']) #iconContainer {
@@ -83,7 +84,7 @@
   <div id="avatarContainer">
     <img class="profile-avatar" alt="" src="[[profileState.avatarIcon]]">
     <div id="iconContainer" hidden="[[!profileState.isManaged]]">
-      <iron-icon icon="signin:business"></iron-icon>
+      <iron-icon icon="cr:domain"></iron-icon>
     </div>
   </div>
   <div class="profile-card-info">[[profileState.gaiaName]]</div>

chrome/browser/resources/signin/profile_picker/profile_card.js

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import 'chrome://resources/cr_elements/cr_button/cr_button.m.js';
-import './signin_icons.js';
+import 'chrome://resources/cr_elements/icons.m.js';
 import './profile_card_menu.js';
 import './profile_picker_shared_css.js';
 

chrome/browser/resources/signin/signin_icons.js

-// Copyright 2020 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'chrome://resources/polymer/v3_0/iron-iconset-svg/iron-iconset-svg.js';
-
-const element = document.createElement('iron-iconset-svg');
-element.name = 'signin';
-element.innerHTML = `
-<svg>
-  <defs>
-    <!-- Copied from iron-icons. -->
-    <g id="business">
-      <path d="M12 7V3H2v18h20V7H12zM6 19H4v-2h2v2zm0-4H4v-2h2v2zm0-4H4V9h2v2zm0-4H4V5h2v2zm4 12H8v-2h2v2zm0-4H8v-2h2v2zm0-4H8V9h2v2zm0-4H8V5h2v2zm10 12h-8v-2h2v-2h-2v-2h2v-2h-2V9h8v10zm-2-8h-2v2h2v-2zm0 4h-2v2h2v-2z">
-      </path>
-    </g>
-  </defs>
-</svg>`;
-document.head.appendChild(element);

chrome/browser/ui/webui/signin/dice_web_signin_intercept_ui.cc

@@ -26,7 +26,6 @@ DiceWebSigninInterceptUI::DiceWebSigninInterceptUI(content::WebUI* web_ui)
                           IDR_SIGNIN_DICE_WEB_INTERCEPT_APP_JS);
   source->AddResourcePath("dice_web_signin_intercept_browser_proxy.js",
                           IDR_SIGNIN_DICE_WEB_INTERCEPT_BROWSER_PROXY_JS);
-  source->AddResourcePath("signin_icons.js", IDR_SIGNIN_ICONS_JS);
   source->AddResourcePath("signin_shared_css.js", IDR_SIGNIN_SHARED_CSS_JS);
   source->AddResourcePath("signin_vars_css.js", IDR_SIGNIN_VARS_CSS_JS);
 

chrome/browser/ui/webui/signin/profile_customization_ui.cc

@@ -33,7 +33,6 @@ ProfileCustomizationUI::ProfileCustomizationUI(content::WebUI* web_ui)
                           IDR_PROFILE_CUSTOMIZATION_APP_JS);
   source->AddResourcePath("profile_customization_browser_proxy.js",
                           IDR_PROFILE_CUSTOMIZATION_BROWSER_PROXY_JS);
-  source->AddResourcePath("signin_icons.js", IDR_SIGNIN_ICONS_JS);
   source->AddResourcePath("signin_shared_css.js", IDR_SIGNIN_SHARED_CSS_JS);
   source->AddResourcePath("signin_vars_css.js", IDR_SIGNIN_VARS_CSS_JS);