WebUI: Make cr-fingerprint-progress-arc available in non-CrOS

This CL makes the fingerprint enrollment + completion animation
available to other platforms outside of CrOS.

Bug: 974046
Change-Id: Ia5b87a98be543296dd4c1bbbfb10f6e71a1d58ad
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1724898Reviewed-by: Mitsuru Oshima <oshima@chromium.org>
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Commit-Queue: Matthew Webb <noviv@google.com>
Cr-Commit-Position: refs/heads/master@{#685263}

chrome/app/theme/theme_resources.grd

@@ -114,7 +114,6 @@
         <structure type="chrome_scaled_image" name="IDR_FILETYPE_LARGE_GENERIC" file="cros/file_types/thumbnails/generic.png" />
         <structure type="chrome_scaled_image" name="IDR_FILETYPE_LARGE_VIDEO" file="cros/file_types/thumbnails/video.png" />
       </if>
-
       <if expr="chromeos">
         <if expr="_google_chrome">
           <structure type="chrome_scaled_image" name="IDR_FIRST_RUN_GREETING" file="google_chrome/cros/first_run_greeting.png" />

chrome/browser/resources/chromeos/login/BUILD.gn

@@ -192,7 +192,7 @@ js_library("enrollment_license_card") {
 js_library("fingerprint_setup") {
   deps = [
     ":oobe_dialog_host_behavior",
-    "//ui/webui/resources/cr_elements/chromeos/fingerprint:cr_fingerprint_progress_arc",
+    "//ui/webui/resources/cr_elements/cr_fingerprint:cr_fingerprint_progress_arc",
     "//ui/webui/resources/js:i18n_behavior",
   ]
 }

chrome/browser/resources/chromeos/login/fingerprint_setup.html

@@ -5,7 +5,7 @@
 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-iconset-svg/iron-iconset-svg.html">
-<link rel="import" href="chrome://resources/cr_elements/chromeos/fingerprint/cr_fingerprint_progress_arc.html">
+<link rel="import" href="chrome://resources/cr_elements/cr_fingerprint/cr_fingerprint_progress_arc.html">
 
 <iron-iconset-svg name="fingerprint-setup-32" size="32">
   <svg>

chrome/browser/resources/settings/people_page/BUILD.gn

@@ -222,7 +222,7 @@ js_library("profile_info_browser_proxy") {
 js_library("setup_fingerprint_dialog") {
   deps = [
     ":fingerprint_browser_proxy",
-    "//ui/webui/resources/cr_elements/chromeos/fingerprint:cr_fingerprint_progress_arc",
+    "//ui/webui/resources/cr_elements/cr_fingerprint:cr_fingerprint_progress_arc",
     "//ui/webui/resources/js:i18n_behavior",
     "//ui/webui/resources/js:web_ui_listener_behavior",
   ]

chrome/browser/resources/settings/people_page/setup_fingerprint_dialog.html

 <link rel="import" href="chrome://resources/html/polymer.html">
 
-<link rel="import" href="chrome://resources/cr_elements/chromeos/fingerprint/cr_fingerprint_progress_arc.html">
+<link rel="import" href="chrome://resources/cr_elements/cr_fingerprint/cr_fingerprint_progress_arc.html">
 <link rel="import" href="chrome://resources/cr_elements/cr_button/cr_button.html">
 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html">
 <link rel="import" href="chrome://resources/cr_elements/icons.html">

chrome/test/data/webui/cr_elements/cr_elements_browsertest.js

@@ -349,6 +349,8 @@ TEST_F('CrElementsPolicyNetworkIndicatorTest', 'All', function() {
   mocha.run();
 });
 
+GEN('#endif');
+
 /**
  * @constructor
  * @extends {CrElementsBrowserTest}
@@ -359,7 +361,7 @@ CrElementsFingerprintProgressArcTest.prototype = {
   __proto__: CrElementsBrowserTest.prototype,
 
   /** @override */
-  browsePreload: 'chrome://resources/cr_elements/chromeos/fingerprint/' +
+  browsePreload: 'chrome://resources/cr_elements/cr_fingerprint/' +
       'cr_fingerprint_progress_arc.html',
 
   /** @override */
@@ -377,8 +379,6 @@ TEST_F('CrElementsFingerprintProgressArcTest', 'All', function() {
   mocha.run();
 });
 
-GEN('#endif');
-
 /**
  * @constructor
  * @extends {CrElementsBrowserTest}

ui/chromeos/resources/ui_chromeos_resources.grd

@@ -94,8 +94,6 @@
       <structure type="chrome_scaled_image" name="IDR_PRINT_NOTIFICATION_HELP" file="print_notification/help.png" />
 
       <!-- Fingerprint images. -->
-      <structure type="chrome_scaled_image" name="IDR_LOGIN_FINGERPRINT_ICON_ANIMATION" file="fingerprint/fingerprint.png" />
-      <structure type="chrome_scaled_image" name="IDR_LOGIN_FINGERPRINT_ENROLLMENT_COMPLETE_ANIMATION" file="fingerprint/tick.png" />
       <structure type="chrome_scaled_image" name="IDR_LOGIN_FINGERPRINT_SCANNER_TABLET_POWER_BUTTON_ANIMATION" file="fingerprint/fingerprint_scanner_tablet_power_button.png" />
       <structure type="chrome_scaled_image" name="IDR_LOGIN_FINGERPRINT_SCANNER_LAPTOP_BOTTOM_RIGHT_ANIMATION" file="fingerprint/fingerprint_scanner_laptop_bottom_right.png" />
       <structure type="chrome_scaled_image" name="IDR_LOGIN_FINGERPRINT_SCANNER_LAPTOP_TOP_RIGHT_ANIMATION" file="fingerprint/fingerprint_scanner_laptop_top_right.png" />

ui/resources/ui_resources.grd

@@ -114,6 +114,10 @@
         <structure type="chrome_scaled_image" name="IDR_EASY_UNLOCK_UNLOCKED" file="common/easy_unlock_unlocked.png" />
         <structure type="chrome_scaled_image" name="IDR_EASY_UNLOCK_UNLOCKED_HOVER" file="common/easy_unlock_unlocked_hover.png" />
         <structure type="chrome_scaled_image" name="IDR_EASY_UNLOCK_UNLOCKED_PRESSED" file="common/easy_unlock_unlocked_pressed.png" />
+        <if expr="not is_android">
+          <structure type="chrome_scaled_image" name="IDR_FINGERPRINT_COMPLETE_TICK" file="common/tick.png" />
+          <structure type="chrome_scaled_image" name="IDR_FINGERPRINT_ICON_ANIMATION" file="common/fingerprint.png" />
+        </if>
         <if expr="is_macosx or is_ios">
           <structure type="chrome_scaled_image" name="IDR_FOLDER_CLOSED" file="mac/folder.png" />
           <structure type="chrome_scaled_image" name="IDR_FOLDER_CLOSED_WHITE" file="mac/folder_white.png" />

ui/webui/resources/cr_elements/BUILD.gn

@@ -14,6 +14,7 @@ group("closure_compile") {
     "cr_dialog:closure_compile",
     "cr_drawer:closure_compile",
     "cr_expand_button:closure_compile",
+    "cr_fingerprint:closure_compile",
     "cr_icon_button:closure_compile",
     "cr_input:closure_compile",
     "cr_link_row:closure_compile",

ui/webui/resources/cr_elements/chromeos/BUILD.gn

@@ -9,7 +9,6 @@ assert(is_chromeos, "Only ChromeOS components belong here.")
 group("closure_compile") {
   deps = [
     "cr_picture:closure_compile",
-    "fingerprint:closure_compile",
     "network:closure_compile",
   ]
 }

ui/webui/resources/cr_elements/chromeos/fingerprint/cr_fingerprint_progress_arc.html → ui/webui/resources/cr_elements/cr_fingerprint/cr_fingerprint_progress_arc.html

-<link rel="import" href="../../../html/polymer.html">
+<link rel="import" href="../../html/polymer.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-iconset-svg/iron-iconset-svg.html">
 
 <iron-iconset-svg name="cr-fingerprint-icon" size="32">
@@ -61,12 +61,12 @@
       <canvas id="canvas" height="240" width="460"></canvas>
     </div>
     <div id="imageDiv">
-      <img id="scanningAnimation" src="chrome://theme/IDR_LOGIN_FINGERPRINT_ICON_ANIMATION">
+      <img id="scanningAnimation" src="chrome://theme/IDR_FINGERPRINT_ICON_ANIMATION">
       <iron-icon id="enrollmentDone" icon="cr-fingerprint-icon:enrollment-done" hidden>
       </iron-icon>
     </div>
     <div id="checkmarkDiv" hidden>
-      <img id="checkmarkAnimation" src="chrome://theme/IDR_LOGIN_FINGERPRINT_ENROLLMENT_COMPLETE_ANIMATION">
+      <img id="checkmarkAnimation" src="chrome://theme/IDR_FINGERPRINT_COMPLETE_TICK">
     </div>
   </template>
   <script src="cr_fingerprint_progress_arc.js"></script>

ui/webui/resources/cr_elements_resources.grdp

@@ -37,6 +37,14 @@
              file="cr_elements/cr_container_shadow_behavior.js"
              type="chrome_html"
              compress="gzip" />
+  <structure name="IDR_CR_ELEMENTS_CR_FINGERPRINT_PROGRESS_ARC_HTML"
+             file="cr_elements/cr_fingerprint/cr_fingerprint_progress_arc.html"
+             type="chrome_html"
+             compress="gzip" />
+  <structure name="IDR_CR_ELEMENTS_CR_FINGERPRINT_PROGRESS_ARC_JS"
+             file="cr_elements/cr_fingerprint/cr_fingerprint_progress_arc.js"
+             type="chrome_html"
+             compress="gzip" />
   <structure name="IDR_CR_ELEMENTS_CR_INPUT_HTML"
              file="cr_elements/cr_input/cr_input.html"
              type="chrome_html"
@@ -264,14 +272,6 @@
                type="chrome_html"
                preprocess="true"
                compress="gzip" />
-     <structure name="IDR_CR_ELEMENTS_CHROMEOS_CR_FINGERPRINT_PROGRESS_ARC_HTML"
-               file="cr_elements/chromeos/fingerprint/cr_fingerprint_progress_arc.html"
-               type="chrome_html"
-               compress="gzip" />
-    <structure name="IDR_CR_ELEMENTS_CHROMEOS_CR_FINGERPRINT_PROGRESS_ARC_JS"
-               file="cr_elements/chromeos/fingerprint/cr_fingerprint_progress_arc.js"
-               type="chrome_html"
-               compress="gzip" />
   </if>
   <structure name="IDR_CR_ELEMENTS_CR_POLICY_INDICATOR_HTML"
              file="cr_elements/policy/cr_policy_indicator.html"