7409daf4f4ee3400742d31c833fad46fe18e7f1f - chromium/src

29 views
Skip to first unread message

ant...@google.com

unread,
Mar 23, 2021, 10:52:05 AM3/23/21
to chromium...@chromium.org
commit 7409daf4f4ee3400742d31c833fad46fe18e7f1f
Author: Denis Kuznetsov <ant...@google.com>
AuthorDate: Tue Mar 23 14:51:18 2021
Commit: Chromium LUCI CQ <chromiu...@luci-project-accounts.iam.gserviceaccount.com>
CommitDate: Tue Mar 23 14:51:18 2021

OOBE: reduce unnecessary use of hd-iron-icon

This CL removes most of the uses of hd-iron-icon element in the OOBE,
as most of the icons are served as SVG images and will be automatically
rescaled if necessary.

Also most of the screen icons are moved to oobe_icons.html

Bug: None
Change-Id: I808b96d993081167534125dcc2d4b71de79cdfbe
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2780482
Commit-Queue: Denis Kuznetsov [CET] <ant...@chromium.org>
Reviewed-by: Roman Aleksandrov <raleks...@google.com>
Cr-Commit-Position: refs/heads/master@{#865629}

diff --git a/chrome/browser/resources/chromeos/assistant_optin/assistant_get_more.html b/chrome/browser/resources/chromeos/assistant_optin/assistant_get_more.html
index d5c416f..252d189 100644
--- a/chrome/browser/resources/chromeos/assistant_optin/assistant_get_more.html
+++ b/chrome/browser/resources/chromeos/assistant_optin/assistant_get_more.html
@@ -2,7 +2,10 @@
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->

-<link rel="import" href="/components/hd_iron_icon.html">
+<link rel="import" href="chrome://resources/html/polymer.html">
+
+<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
+
<link rel="import" href="/components/oobe_i18n_behavior.html">
<link rel="import" href="/components/oobe_adaptive_dialog.html">
<link rel="import" href="/components/oobe_dialog_host_behavior.html">
@@ -14,10 +17,9 @@
<link rel="stylesheet" href="assistant_shared_styles.css">
<oobe-adaptive-dialog id="get-more-dialog" role="dialog" hide-shadow
aria-label$="[[i18nDynamic(locale, 'assistantReadyTitle')]]">
- <hd-iron-icon slot="icon"
- icon1x="assistant-32:assistant" icon2x="assistant-64:assistant"
+ <iron-icon slot="icon" icon="assistant-32:assistant"
aria-label$="[[i18nDynamic(locale, 'assistantLogo')]]">
- </hd-iron-icon>
+ </iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'assistantReadyTitle')]]
</h1>
diff --git a/chrome/browser/resources/chromeos/assistant_optin/assistant_loading.html b/chrome/browser/resources/chromeos/assistant_optin/assistant_loading.html
index 8c5ee1d..d036f91 100644
--- a/chrome/browser/resources/chromeos/assistant_optin/assistant_loading.html
+++ b/chrome/browser/resources/chromeos/assistant_optin/assistant_loading.html
@@ -2,11 +2,13 @@
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->

+<link rel="import" href="chrome://resources/html/polymer.html">
+
<link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expand_button.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-collapse.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-progress/paper-progress.html">

-<link rel="import" href="/components/hd_iron_icon.html">
<link rel="import" href="/components/oobe_i18n_behavior.html">
<link rel="import" href="/components/oobe_adaptive_dialog.html">
<link rel="import" href="/components/oobe_content_dialog.html">
@@ -31,10 +33,9 @@
</oobe-content-dialog>
<oobe-adaptive-dialog id="error-dialog" role="dialog" hide-shadow
for-step="error">
- <hd-iron-icon slot="icon"
- icon1x="assistant-32:assistant" icon2x="assistant-64:assistant"
+ <iron-icon slot="icon" icon="assistant-32:assistant"
aria-label$="[[i18nDynamic(locale, 'assistantLogo')]]">
- </hd-iron-icon>
+ </iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'assistantOptinLoadErrorTitle')]]
</h1>
diff --git a/chrome/browser/resources/chromeos/assistant_optin/assistant_related_info.html b/chrome/browser/resources/chromeos/assistant_optin/assistant_related_info.html
index 8c8b04b..52c9668 100644
--- a/chrome/browser/resources/chromeos/assistant_optin/assistant_related_info.html
+++ b/chrome/browser/resources/chromeos/assistant_optin/assistant_related_info.html
@@ -2,7 +2,10 @@
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->

-<link rel="import" href="/components/hd_iron_icon.html">
+<link rel="import" href="chrome://resources/html/polymer.html">
+
+<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
+
<link rel="import" href="/components/oobe_i18n_behavior.html">
<link rel="import" href="/components/oobe_adaptive_dialog.html">
<link rel="import" href="/components/oobe_dialog_host_behavior.html">
@@ -39,10 +42,9 @@
<link rel="stylesheet" href="assistant_shared_styles.css">
<oobe-adaptive-dialog id="relatedInfoDialog" role="dialog" hide-shadow
aria-label$="[[i18nDynamic(locale, titleKey_)]]">
- <hd-iron-icon slot="icon"
- icon1x="assistant-32:assistant" icon2x="assistant-64:assistant"
+ <iron-icon slot="icon" icon="assistant-32:assistant"
aria-label$="[[i18nDynamic(locale, 'assistantLogo')]]">
- </hd-iron-icon>
+ </iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, titleKey_)]]
</h1>
diff --git a/chrome/browser/resources/chromeos/assistant_optin/assistant_third_party.html b/chrome/browser/resources/chromeos/assistant_optin/assistant_third_party.html
index 9e16ed5..d7cf911 100644
--- a/chrome/browser/resources/chromeos/assistant_optin/assistant_third_party.html
+++ b/chrome/browser/resources/chromeos/assistant_optin/assistant_third_party.html
@@ -2,7 +2,10 @@
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->

-<link rel="import" href="/components/hd_iron_icon.html">
+<link rel="import" href="chrome://resources/html/polymer.html">
+
+<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
+
<link rel="import" href="/components/oobe_i18n_behavior.html">
<link rel="import" href="/components/oobe_adaptive_dialog.html">
<link rel="import" href="/components/oobe_dialog_host_behavior.html">
@@ -13,10 +16,9 @@
<link rel="stylesheet" href="assistant_shared_styles.css">
<link rel="stylesheet" href="assistant_third_party.css">
<oobe-adaptive-dialog id="third-party-dialog" role="dialog" hide-shadow>
- <hd-iron-icon slot="icon"
- icon1x="assistant-32:assistant" icon2x="assistant-64:assistant"
+ <iron-icon slot="icon" icon="assistant-32:assistant"
aria-label$="[[i18nDynamic(locale, 'assistantLogo')]]">
- </hd-iron-icon>
+ </iron-icon>
<h1 slot="title" id="title-text"></h1>
<div slot="content" class="landscape-header-aligned">
<div class="line"></div>
diff --git a/chrome/browser/resources/chromeos/assistant_optin/assistant_value_prop.html b/chrome/browser/resources/chromeos/assistant_optin/assistant_value_prop.html
index 7b5b305..6f8d794 100644
--- a/chrome/browser/resources/chromeos/assistant_optin/assistant_value_prop.html
+++ b/chrome/browser/resources/chromeos/assistant_optin/assistant_value_prop.html
@@ -2,10 +2,12 @@
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->

+<link rel="import" href="chrome://resources/html/polymer.html">
+
<link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expand_button.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-collapse.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">

-<link rel="import" href="/components/hd_iron_icon.html">
<link rel="import" href="/components/oobe_i18n_behavior.html">
<link rel="import" href="/components/oobe_adaptive_dialog.html">
<link rel="import" href="/components/oobe_dialog_host_behavior.html">
@@ -16,10 +18,9 @@
<link rel="stylesheet" href="assistant_shared_styles.css">
<link rel="stylesheet" href="assistant_value_prop.css">
<oobe-adaptive-dialog id="value-prop-dialog" role="dialog">
- <hd-iron-icon slot="icon"
- icon1x="assistant-32:assistant" icon2x="assistant-64:assistant"
+ <iron-icon slot="icon" icon="assistant-32:assistant"
aria-label$="[[i18nDynamic(locale, 'assistantLogo')]]">
- </hd-iron-icon>
+ </iron-icon>
<h1 slot="title" id="title-text"></h1>
<div slot="subtitle" id="animation-container-horizontal-mode"
class="animation-container">
diff --git a/chrome/browser/resources/chromeos/assistant_optin/assistant_voice_match.html b/chrome/browser/resources/chromeos/assistant_optin/assistant_voice_match.html
index 18250e6..eeb96c4 100644
--- a/chrome/browser/resources/chromeos/assistant_optin/assistant_voice_match.html
+++ b/chrome/browser/resources/chromeos/assistant_optin/assistant_voice_match.html
@@ -2,11 +2,12 @@
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->

+<link rel="import" href="chrome://resources/html/polymer.html">
+
<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
<link rel="import" href="chrome://resources/cr_elements/icons.html">
<link rel="import" href="chrome://resources/cr_elements/cr_lottie/cr_lottie.html">

-<link rel="import" href="/components/hd_iron_icon.html">
<link rel="import" href="/components/oobe_i18n_behavior.html">
<link rel="import" href="/components/oobe_adaptive_dialog.html">
<link rel="import" href="/components/oobe_dialog_host_behavior.html">
@@ -20,10 +21,9 @@
<oobe-adaptive-dialog id="voiceMatchIntroDialog" role="dialog"
aria-label$="[[i18nDynamic(locale, 'assistantVoiceMatchTitle')]]"
hide-shadow for-step="intro">
- <hd-iron-icon slot="icon"
- icon1x="assistant-32:assistant" icon2x="assistant-64:assistant"
+ <iron-icon slot="icon" icon="assistant-32:assistant"
aria-label$="[[i18nDynamic(locale, 'assistantLogo')]]">
- </hd-iron-icon>
+ </iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'assistantVoiceMatchTitle')]]
</h1>
@@ -51,10 +51,9 @@
<oobe-adaptive-dialog id="voiceMatchRecordingDialog" role="dialog"
aria-label$="[[i18nDynamic(locale, 'assistantVoiceMatchRecording')]]"
hide-shadow for-step="recording, completed">
- <hd-iron-icon slot="icon"
- icon1x="assistant-32:assistant" icon2x="assistant-64:assistant"
+ <iron-icon slot="icon" icon="assistant-32:assistant"
aria-label$="[[i18nDynamic(locale, 'assistantLogo')]]">
- </hd-iron-icon>
+ </iron-icon>
<h1 slot="title" for-step="recording">
[[i18nDynamic(locale, 'assistantVoiceMatchRecording')]]
</h1>
@@ -104,10 +103,9 @@
aria-label$=
"[[i18nDynamic(locale, 'assistantVoiceMatchAlreadySetupTitle')]]"
hide-shadow for-step="already-setup">
- <hd-iron-icon slot="icon"
- icon1x="assistant-32:assistant" icon2x="assistant-64:assistant"
+ <iron-icon slot="icon" icon="assistant-32:assistant"
aria-label$="[[i18nDynamic(locale, 'assistantLogo')]]">
- </hd-iron-icon>
+ </iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'assistantVoiceMatchAlreadySetupTitle')]]
</h1>
diff --git a/chrome/browser/resources/chromeos/login/arc_terms_of_service.html b/chrome/browser/resources/chromeos/login/arc_terms_of_service.html
index 180f111..15d8541 100644
--- a/chrome/browser/resources/chromeos/login/arc_terms_of_service.html
+++ b/chrome/browser/resources/chromeos/login/arc_terms_of_service.html
@@ -2,6 +2,8 @@
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->

+<link rel="import" href="chrome://resources/html/polymer.html">
+
<link rel="import" href="chrome://oobe/custom_elements.html">
<link rel="import" href="chrome://resources/cr_elements/cr_checkbox/cr_checkbox.html">
<link rel="import" href="chrome://resources/html/action_link.html">
@@ -77,9 +79,7 @@
<oobe-adaptive-dialog id="arcTosErrorDialog" for-step="error"
role="dialog"
aria-label$="[[i18nDynamic(locale, 'arcTermsOfServiceScreenHeading')]]">
- <hd-iron-icon slot="icon"
- icon1x="oobe-32:warning" icon2x="oobe-64:warning">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:warning"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'arcTermsOfServiceErrorTitle')]]
</h1>
diff --git a/chrome/browser/resources/chromeos/login/checking_downloading_update.html b/chrome/browser/resources/chromeos/login/checking_downloading_update.html
index 22d6845..316564c 100644
--- a/chrome/browser/resources/chromeos/login/checking_downloading_update.html
+++ b/chrome/browser/resources/chromeos/login/checking_downloading_update.html
@@ -2,12 +2,13 @@
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->

+<link rel="import" href="chrome://resources/html/polymer.html">
+
<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-progress/paper-progress.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html">

<link rel="import" href="/components/common_styles.html">
-<link rel="import" href="/components/hd_iron_icon.html">
<link rel="import" href="/components/oobe_adaptive_dialog.html">
<link rel="import" href="/components/oobe_i18n_behavior.html">
<link rel="import" href="/components/oobe_dialog_host_behavior.html">
@@ -58,9 +59,7 @@
</style>
<oobe-adaptive-dialog hidden="[[!checkingForUpdate]]"
aria-live="polite" id="checking-for-updates-dialog" footer-shrinkable>
- <hd-iron-icon slot="icon"
- icon1x="oobe-32:googleg" icon2x="oobe-64:googleg">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:googleg"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'checkingForUpdates')]]
</h1>
@@ -84,9 +83,7 @@
hidden="[[isCheckingOrUpdateCompleted_(checkingForUpdate,
updateCompleted)]]"
aria-live="polite">
- <hd-iron-icon slot="icon"
- icon1x="oobe-32:googleg" icon2x="oobe-64:googleg">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:googleg"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'updatingTitle')]]
</h1>
@@ -112,9 +109,7 @@

<oobe-adaptive-dialog footer-shrinkable id="update-complete-dialog"
hidden="[[!updateCompleted]]" aria-live="polite">
- <hd-iron-icon slot="icon"
- icon1x="oobe-32:googleg" icon2x="oobe-64:googleg">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:googleg"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'updateCompeletedMsg')]]
</h1>
diff --git a/chrome/browser/resources/chromeos/login/components/oobe_icons.html b/chrome/browser/resources/chromeos/login/components/oobe_icons.html
index eee4c3d..d084944 100644
--- a/chrome/browser/resources/chromeos/login/components/oobe_icons.html
+++ b/chrome/browser/resources/chromeos/login/components/oobe_icons.html
@@ -91,6 +91,57 @@
<path fill="#5BB974" d="M28.667 13.117L15.917 12v8l3.683 1.95 3.917-1.283 1.016-1.334 3.717-4.866c.317-.4.433-.884.417-1.35z"></path>
<path fill="#FCC934" d="M15.917 29.333c.583 0 1.183-.266 1.583-.783l6.017-7.883-7.6-.667v9.333z"></path>
</g>
+ <g id="accessibility" fill-rule="evenodd">
+ <path d="M16 2.667c1.467 0 2.667 1.184 2.667 2.633 0 1.448-1.2 2.632-2.667 2.632-1.467 0-2.667-1.184-2.667-2.632 0-1.45 1.2-2.633 2.667-2.633zm4 9.215v16.785h-3v-7.9h-2v7.9h-3V11.882H4V8.92h24v2.962h-8z"></path>
+ </g>
+ <g id="language" fill-rule="evenodd">
+ <path d="M15.987 2.667C8.627 2.667 2.667 8.64 2.667 16s5.96 13.333 13.32 13.333c7.373 0 13.346-5.973 13.346-13.333S23.36 2.667 15.987 2.667zm9.24 8h-3.934C20.867 9 20.253 7.4 19.453 5.92c2.454.84 4.494 2.547 5.774 4.747zM16 5.387c1.107 1.6 1.973 3.373 2.547 5.28h-5.094c.574-1.907 1.44-3.68 2.547-5.28zM5.68 18.667c-.213-.854-.347-1.747-.347-2.667 0-.92.134-1.813.347-2.667h4.507C10.08 14.213 10 15.093 10 16c0 .907.08 1.787.187 2.667H5.68zm1.093 2.666h3.934c.426 1.667 1.04 3.267 1.84 4.747-2.454-.84-4.494-2.533-5.774-4.747zm3.934-10.666H6.773c1.28-2.214 3.32-3.907 5.774-4.747-.8 1.48-1.414 3.08-1.84 4.747zM16 26.613c-1.107-1.6-1.973-3.373-2.547-5.28h5.094c-.574 1.907-1.44 3.68-2.547 5.28zm3.12-7.946h-6.24c-.12-.88-.213-1.76-.213-2.667 0-.907.093-1.8.213-2.667h6.24c.12.867.213 1.76.213 2.667 0 .907-.093 1.787-.213 2.667zm.333 7.413c.8-1.48 1.414-3.08 1.84-4.747h3.934c-1.28 2.2-3.32 3.907-5.774 4.747zm2.36-7.413c.107-.88.187-1.76.187-2.667 0-.907-.08-1.787-.187-2.667h4.507c.213.8
54.347 1.747.347 2.667 0 .92-.134 1.813-.347 2.667h-4.507z"></path>
+ </g>
+ <g id="timezone" fill-rule="evenodd">
+ <path d="M15.993 2.667C8.627 2.667 2.667 8.633 2.667 16s5.96 13.333 13.326 13.333c7.367 0 13.34-5.966 13.34-13.333S23.36 2.667 15.993 2.667zm.007 24c-5.893 0-10.667-4.774-10.667-10.667S10.107 5.333 16 5.333 26.667 10.107 26.667 16 21.893 26.667 16 26.667z"></path>
+ <path d="M16.667 9.333h-2v8l6.993 4.2 1.007-1.64-6-3.56"></path>
+ </g>
+ <g id="wifi" fill-rule="evenodd">
+ <path d="M1.333 12L4 14.667c6.627-6.627 17.373-6.627 24 0L30.667 12c-8.1-8.1-21.234-8.1-29.334 0zM12 22.667l4 4 4-4c-2.207-2.207-5.793-2.207-8 0zm-5.333-5.334L9.333 20c3.68-3.68 9.654-3.68 13.334 0l2.666-2.667c-5.153-5.153-13.513-5.153-18.666 0z"></path>
+ </g>
+ <g id="connect-devices">
+ <path fill-rule="evenodd" clip-rule="evenodd" d="M3 0h24c1.65 0 3 1.35 3 3v7.418a9.898 9.898 0 00-3-1.313V3H3v15h12.016v3H3c-1.65 0-3-1.35-3-3L.015 3C.015 1.35 1.35 0 3 0zm12.902 13.5a7.384 7.384 0 00-.87 3H9v-3h6.902zM21 9.332a9.636 9.636 0 00-3 1.648V9h3v.332zM13.5 4.5h3v3h-3v-3zm3 4.5h-3v3h3V9zM9 4.5h3v3H9v-3zM12 9H9v3h3V9zM4.5 9h3v3h-3V9zm3-4.5h-3v3h3v-3zm10.5 0h3v3h-3v-3zm4.5 0h3v3h-3v-3z" fill="#1A73E8"></path><path fill-rule="evenodd" clip-rule="evenodd" d="M24.5 11c-4.146 0-7.5 3.13-7.5 7v6c0 3.87 3.354 7 7.5 7s7.5-3.13 7.5-7v-6c0-3.87-3.354-7-7.5-7zm5 6.875v.625h-3.75v-5c2.5 0 3.75 2.5 3.75 4.375zM23.25 13.5v5H19.5V18c0-2 1.25-4.5 3.75-4.5zm1.25 15c-2.957 0-5-1.74-5-4.5v-3h10v3c0 2.76-2.043 4.5-5 4.5z" fill="#1A73E8"></path>
+ </g>
+ <g id="gestures" fill="none" fill-rule="evenodd">
+ <path d="M-.5 0h29.5385v29.5385H-.5z"></path>
+ <path fill="#1a73e8" d="M16.115.0125a3.053 3.053 0 012.536 1.3415 3.0255 3.0255 0 011.1565-.2215 3.078 3.078 0 013.077 3.0765v.345a3.078 3.078 0 013.6925 3.015v7.2h-2.462v-7.2c0-.3445-.271-.615-.6155-.615-.345 0-.615.2705-.615.615v7.2h-2.462V4.209c0-.3445-.2705-.615-.615-.615-.345 0-.6155.2705-.6155.615v10.56h-2.4615V3.089c0-.3445-.271-.615-.6155-.615-.345 0-.6155.2705-.6155.615v11.68H13.038V5.8955c0-.345-.271-.6155-.615-.6155-.345 0-.616.283-.616.615v15.84l-6.5845-3.4825-.6275.5535 7.212 7.508c.468.48 1.108.763 1.7725.763H15.5v2.4615h-1.9075a4.974 4.974 0 01-3.557-1.514L1.05 18.6585l2.548-2.2525a2.464 2.464 0 012.7815-.332l2.966 1.575V5.8955a3.078 3.078 0 013.077-3.077c.2095 0 .4185.025.628.0615.1105-1.6 1.44-2.8675 3.0645-2.8675z"></path>
+ <path fill="#1a73e8" d="M25.651 20.849l1.1565 2.5355 1.157-2.535L30.5 19.692l-2.535-1.157L26.807 16l-1.1565 2.535-2.5355 1.1575 2.535 1.1565zm-5.54 7.771L21.6545 32l1.5425-3.3805 3.38-1.5425-3.38-1.5425-1.5425-3.3805-1.5425 3.38-3.3805 1.543 3.38 1.5425z"></path>
+ </g>
+ <g id="gesture-overview" fill="none" >
+ <path fill="#1a73e8" fill-rule="evenodd" d="M2 7.6h16.8v16.8H2zm14 2.8H4.8v11.2H16z" clip-rule="evenodd"></path>
+ <path fill="#1a73e8" d="M24.4 7.6h-2.8v16.8h2.8zm5.6 0h-2.8v16.8H30z"></path>
+ </g>
+ <g id="gesture-back" fill="none" >
+ <defs>
+ <path id="a" d="M32 14H7.66L18.84 2.82 16 0 0 16l16 16 2.82-2.82L7.66 18H32z"></path>
+ </defs>
+ <g fill="none" fill-rule="evenodd" transform="translate(5.33328 5.33328) scale(.66667)">
+ <mask id="b" fill="#fff">
+ <use xlink:href="#a" width="100%" height="100%"></use>
+ </mask>
+ <g fill="#1a73e8" mask="url(#b)">
+ <path d="M -8,-8 H 40 V 40 H -8 Z"></path>
+ </g>
+ </g>
+ </g>
+ <g id="gesture-home" fill="none" >
+ <defs>
+ <path id="c" d="M16 0L0 12v24h32V12L16 0zm12 32h-6V20H10v12H4V14l12-9 12 9v18z"></path>
+ </defs>
+ <g fill="none" fill-rule="evenodd" transform="matrix(.66667 0 0 .66667 5.333333 4)">
+ <mask id="d" fill="#fff">
+ <use xlink:href="#c" width="100%" height="100%"></use>
+ </mask>
+ <g fill="#1a73e8" mask="url(#d)">
+ <path d="M -8,-6 H 40 V 42 H -8 Z"></path>
+ </g>
+ </g>
+ </g>
</defs>
</svg>
</iron-iconset-svg>
@@ -119,96 +170,6 @@
</svg>
</iron-iconset-svg>

-<iron-iconset-svg name="oobe-64" size="64">
- <svg>
- <defs>
- <!-- The Google "G" icon. -->
- <g id="googleg" fill="none" fill-rule="evenodd">
- <path d="M59.84 32.66c0-2.057-.185-4.035-.527-5.933H32v11.218h15.607c-.672 3.625-2.715 6.696-5.787 8.753v7.276h9.373c5.483-5.05 8.647-12.483 8.647-21.315z" fill="#4285F4"></path>
- <path d="M32 61c7.83 0 14.395-2.597 19.193-7.026l-9.373-7.276c-2.596 1.74-5.918 2.768-9.82 2.768-7.553 0-13.946-5.1-16.227-11.956H6.085v7.514C10.855 54.5 20.665 61 32 61z" fill="#34A853"></path>
- <path d="M15.773 37.51c-.58-1.74-.91-3.6-.91-5.51 0-1.91.33-3.77.91-5.51v-7.514H6.085C4.12 22.89 3 27.32 3 32s1.12 9.11 3.085 13.024l9.688-7.514z" fill="#FBBC05"></path>
- <path d="M32 14.534c4.258 0 8.08 1.463 11.086 4.337l8.318-8.317C46.38 5.873 39.817 3 32 3 20.664 3 10.856 9.5 6.085 18.976l9.688 7.514c2.28-6.855 8.674-11.956 16.227-11.956z" fill="#EA4335"></path>
- <path d="M3 3h58v58H3"></path>
- </g>
- <g id="enterprise" fill="none" fill-rule="evenodd">
- <path fill="#1A73E8" fill-rule="evenodd"d="M32 20V8H6v48h52V20H32zM16.4 50.6666667h-5.2v-5.3333334h5.2v5.3333334zM16.4 40h-5.2v-5.3333333h5.2V40zm0-10.6666667h-5.2V24h5.2v5.3333333zm0-10.6666666h-5.2v-5.3333334h5.2v5.3333334zm10.4 32h-5.2v-5.3333334h5.2v5.3333334zM26.8 40h-5.2v-5.3333333h5.2V40zm0-10.6666667h-5.2V24h5.2v5.3333333zm0-10.6666666h-5.2v-5.3333334h5.2v5.3333334zm27.2771484 32H32v-5.3333334h5.2V40H32v-5.3333333h5.2v-5.3333334H32V24h22.0771484v26.6666667zM47.6 29.3333333h-5.2v5.3333334h5.2v-5.3333334zM47.6 40h-5.2v5.3333333h5.2V40z"></path>
- </g>
- <!-- Blue exclamation mark in circle -->
- <g id="alert" fill-rule="evenodd">
- <defs>
- <path id="a" d="M29.333 40h5.334v5.333h-5.334V40zm0-21.333h5.334v16h-5.334v-16zm2.64-13.334C17.253 5.333 5.333 17.28 5.333 32c0 14.72 11.92 26.667 26.64 26.667C46.72 58.667 58.667 46.72 58.667 32c0-14.72-11.947-26.667-26.694-26.667zm.027 48c-11.787 0-21.333-9.546-21.333-21.333 0-11.787 9.546-21.333 21.333-21.333 11.787 0 21.333 9.546 21.333 21.333 0 11.787-9.546 21.333-21.333 21.333z"></path>
- </defs>
- <g fill="none" fill-rule="evenodd">
- <path d="M0 0h64v64H0z"></path>
- <use fill="#1A73E8" fill-rule="nonzero" xlink:href="#a"></use>
- </g>
- </g>
- <!-- Red exclamation mark in circle -->
- <g id="warning" fill-rule="evenodd">
- <defs>
- <path id="a" d="M29.333 40h5.334v5.333h-5.334V40zm0-21.333h5.334v16h-5.334v-16zm2.64-13.334C17.253 5.333 5.333 17.28 5.333 32c0 14.72 11.92 26.667 26.64 26.667C46.72 58.667 58.667 46.72 58.667 32c0-14.72-11.947-26.667-26.694-26.667zm.027 48c-11.787 0-21.333-9.546-21.333-21.333 0-11.787 9.546-21.333 21.333-21.333 11.787 0 21.333 9.546 21.333 21.333 0 11.787-9.546 21.333-21.333 21.333z"></path>
- </defs>
- <g fill="none" fill-rule="evenodd">
- <path d="M0 0h64v64H0z"></path>
- <use fill="#D93025" fill-rule="nonzero" xlink:href="#a"></use>
- </g>
- </g>
- <g id="lock">
- <defs>
- <path id="a" d="M48 24h-2.667v-5.333c0-7.36-5.973-13.334-13.333-13.334s-13.333 5.974-13.333 13.334V24H16c-2.933 0-5.333 2.4-5.333 5.333V56c0 2.933 2.4 5.333 5.333 5.333h32c2.933 0 5.333-2.4 5.333-5.333V29.333C53.333 26.4 50.933 24 48 24zm-24-5.333c0-4.427 3.573-8 8-8s8 3.573 8 8V24H24v-5.333zM48 56H16V29.333h32V56zm-16-8c2.933 0 5.333-2.4 5.333-5.333 0-2.934-2.4-5.334-5.333-5.334-2.933 0-5.333 2.4-5.333 5.334C26.667 45.6 29.067 48 32 48z"></path>
- </defs>
- <g fill="none" fill-rule="evenodd">
- <use fill="#1A73E8" fill-rule="nonzero" xlink:href="#a"></use>
- <path d="M0 0h64v64H0z"></path>
- </g>
- </g>
- <g id="fingerprint" fill-rule="evenodd" fill="none">
- <path d="M40.072 10.057c-.18 0-.348-.045-.517-.123C35.246 7.706 31.5 6.75 27.023 6.75c-4.467 0-8.674 1.069-12.533 3.172a1.129 1.129 0 0 1-1.53-.45 1.129 1.129 0 0 1 .45-1.53C17.606 5.66 22.185 4.5 27.023 4.5 31.815 4.5 36 5.558 40.59 7.931c.551.282.765.968.484 1.519a1.139 1.139 0 0 1-1.002.607zM7.875 21.87c-.225 0-.45-.068-.652-.203a1.12 1.12 0 0 1-.27-1.563 23.434 23.434 0 0 1 8.448-7.369c7.076-3.656 16.122-3.667 23.209-.022 3.364 1.732 6.199 4.185 8.438 7.312.36.506.247 1.204-.26 1.564a1.131 1.131 0 0 1-1.574-.259c-2.025-2.835-4.59-5.063-7.628-6.615-6.457-3.319-14.703-3.307-21.15.023a21.128 21.128 0 0 0-7.639 6.67 1.145 1.145 0 0 1-.922.462zm14.074 27.146c-.293 0-.574-.112-.799-.337-1.946-1.969-3.004-3.218-4.522-5.929-1.553-2.767-2.374-6.154-2.374-9.776 0-6.683 5.715-12.128 12.746-12.128 7.031 0 12.746 5.434 12.746 12.128 0 .619-.506 1.125-1.125 1.125a1.128 1.128 0 0 1-1.125-1.125c0-5.445-4.702-9.878-10.496-9.878-5.782 0-10.496 4.433-10.496 9.878 0 3.24.72 6.232 2.081 8.67
4 1.451 2.587 2.419 3.7 4.151 5.444a1.11 1.11 0 0 1-.011 1.587 1.009 1.009 0 0 1-.776.337zm16.121-4.162c-2.678 0-5.029-.675-6.975-1.992-3.341-2.272-5.344-5.962-5.344-9.877 0-.619.506-1.125 1.125-1.125s1.125.506 1.125 1.125c0 3.161 1.631 6.154 4.365 8.01 1.587 1.08 3.454 1.609 5.704 1.609.54 0 1.451-.056 2.351-.214a1.13 1.13 0 0 1 1.305.911 1.13 1.13 0 0 1-.911 1.305 16.11 16.11 0 0 1-2.745.248zM33.536 49.5a.839.839 0 0 1-.292-.045c-3.589-.979-5.929-2.306-8.359-4.725a16.472 16.472 0 0 1-4.871-11.745c0-3.656 3.105-6.626 6.93-6.626 3.825 0 6.93 2.97 6.93 6.626 0 2.407 2.103 4.376 4.68 4.376 2.576 0 4.68-1.957 4.68-4.376 0-8.482-7.313-15.379-16.302-15.379-6.4 0-12.24 3.555-14.872 9.068-.878 1.822-1.316 3.948-1.316 6.311 0 1.755.157 4.523 1.496 8.111a1.133 1.133 0 0 1-.664 1.452 1.133 1.133 0 0 1-1.451-.664c-1.102-2.959-1.643-5.861-1.643-8.899 0-2.7.518-5.152 1.542-7.279 3.004-6.277 9.641-10.338 16.897-10.338 10.227 0 18.551 7.908 18.551 17.628 0 3.657-3.116 6.627-6.93 6.627-3.813 0-6.93
-2.97-6.93-6.627 0-2.407-2.103-4.376-4.68-4.376-2.576
0-4.68 1.957-4.68 4.376 0 3.837 1.497 7.448 4.208 10.148 2.126 2.115 4.196 3.285 7.369 4.151.596.169.956.788.787 1.384a1.117 1.117 0 0 1-1.08.821z" fill="#4285F4"></path>
- <path d="M0 0h54v54H0z"></path>
- </g>
- <g id="gear" fill="none" fill-rule="evenodd">
- <path d="M0 0h64v64H0z"></path>
- <path fill="#1A73E8" fill-rule="nonzero" d="M51.04 34.496c.096-.8.16-1.632.16-2.496 0-.864-.064-1.696-.192-2.496l5.408-4.224c.48-.384.608-1.088.32-1.632l-5.12-8.864c-.32-.576-.992-.768-1.568-.576l-6.368 2.56c-1.344-1.024-2.752-1.856-4.32-2.496l-.96-6.784A1.277 1.277 0 0 0 37.12 6.4H26.88c-.64 0-1.152.448-1.248 1.088l-.96 6.784c-1.568.64-3.008 1.504-4.32 2.496l-6.368-2.56a1.265 1.265 0 0 0-1.568.576l-5.12 8.864c-.32.576-.192 1.248.32 1.632l5.408 4.224c-.128.8-.224 1.664-.224 2.496 0 .832.064 1.696.192 2.496L7.584 38.72c-.48.384-.608 1.088-.32 1.632l5.12 8.864c.32.576.992.768 1.568.576l6.368-2.56c1.344 1.024 2.752 1.856 4.32 2.496l.96 6.784c.128.64.64 1.088 1.28 1.088h10.24c.64 0 1.184-.448 1.248-1.088l.96-6.784c1.568-.64 3.008-1.504 4.32-2.496l6.368 2.56c.576.224 1.248 0 1.568-.576l5.12-8.864c.32-.576.192-1.248-.32-1.632l-5.344-4.224zM32 41.6c-5.28 0-9.6-4.32-9.6-9.6 0-5.28 4.32-9.6 9.6-9.6 5.28 0 9.6 4.32 9.6 9.6 0 5.28-4.32 9.6-9.6 9.6z"></path>
- </g>
- <g id="chromebook">
- <path style=" stroke:none;fill-rule:nonzero;fill:rgb(35.294118%,35.294118%,35.294118%);fill-opacity:1;" d="M 53.332031 45.332031 C 56.265625 45.332031 58.640625 42.933594 58.640625 40 L 58.667969 13.332031 C 58.667969 10.398438 56.265625 8 53.332031 8 L 10.667969 8 C 7.734375 8 5.332031 10.398438 5.332031 13.332031 L 5.332031 40 C 5.332031 42.933594 7.734375 45.332031 10.667969 45.332031 Z M 10.667969 13.332031 L 53.332031 13.332031 L 53.332031 40 L 10.667969 40 Z M 12.453125 48 L 2.667969 48 L 2.667969 53.332031 L 61.332031 53.332031 L 61.332031 48 L 51.546875 48 ">
- </path>
- </g>
- <g id="computer" fill="none" fill-rule="evenodd">
- <path d="M0 0h64v64H0z"></path>
- <path fill="#1A73E8" fill-rule="nonzero" d="M58 48V8H6v40H0v6h64v-6h-6zm-20.667 0H26.667v-2.667h10.666V48zM52 40H12V14h40v26z"></path>
- <path fill="#1A73E8" d="M33.94 24.258L32 18l-1.94 6.258H24l4.94 3.672L27.06 34 32 30.245 36.94 34l-1.88-6.07L40 24.258z"></path>
- </g>
- <g id="checkmark" fill="none" fill-rule="evenodd">
- <path fill="#1A73E8" fill-rule="nonzero" d="M22.933 44.267l-11.2-11.2L8 36.8l14.933 14.933 32-32L51.2 16z"></path>
- <path d="M0 0h64v64H0z"></path>
- </g>
- <g id="checkmarkv2" fill="none">
- <path d="M43.8628 23.3373c-1.2497-1.2497-3.2758-1.2497-4.5255 0L28.8 33.8745l-4.1372-4.1372c-1.2497-1.2497-3.2758-1.2497-4.5255 0-1.2497 1.2496-1.2497 3.2758 0 4.5254l6.4 6.4c1.2497 1.2497 3.2758 1.2497 4.5255 0l12.8-12.8c1.2496-1.2496 1.2496-3.2758 0-4.5254z" fill="#1A73E8"></path>
- <path fill-rule="evenodd" clip-rule="evenodd" d="M32 57.6c14.1385 0 25.6-11.4615 25.6-25.6C57.6 17.8615 46.1385 6.4 32 6.4 17.8615 6.4 6.4 17.8615 6.4 32c0 14.1385 11.4615 25.6 25.6 25.6zm0-6.4c10.6039 0 19.2-8.5961 19.2-19.2S42.6039 12.8 32 12.8c-10.6038 0-19.2 8.5961-19.2 19.2S21.3962 51.2 32 51.2z" fill="#1A73E8"></path>
- </g>
- <g id="checkcircle" fill="none" fill-rule="evenodd">
- <path fill="#5BB974" fill-rule="nonzero" d="M 32,5.3334 C 17.280037,5.3334 5.3334,17.280036 5.3334,32 5.3334,46.719964 17.280037,58.6666 32,58.6666 46.719964,58.6666 58.6666,46.719964 58.6666,32 58.6666,17.280036 46.719964,5.3334 32,5.3334 Z m 0,47.99988 C 20.24003,53.33328 10.66672,43.75997 10.66672,32 10.66672,20.24003 20.24003,10.66672 32,10.66672 43.75997,10.66672 53.33328,20.24003 53.33328,32 53.33328,43.75997 43.75997,53.33328 32,53.33328 Z M 26.66668,37.866652 19.733364,30.933336 16.00004,34.66666 26.66668,45.3333 47.99996,24.00002 44.266636,20.266696 Z"></path>
- <path d="m -14.66665,30.66665 h 48 v 48 h -48 z"></path>
- </g>
- <g id="avatar" fill="none" fill-rule="evenodd">
- <path fill="#fff" d="M0 0h64v64H0z"></path>
- <path fill-rule="evenodd" clip-rule="evenodd" d="M32 5.333C17.28 5.333 5.333 17.28 5.333 32 5.333 46.72 17.28 58.667 32 58.667c14.72 0 26.667-11.947 26.667-26.667C58.667 17.28 46.72 5.333 32 5.333zM48.96 44.88c-3.813-4.64-13.067-6.213-16.96-6.213-3.893 0-13.147 1.573-16.96 6.213-2.72-3.573-4.373-8.027-4.373-12.88 0-11.76 9.573-21.333 21.333-21.333 11.76 0 21.333 9.573 21.333 21.333 0 4.853-1.653 9.307-4.373 12.88zM32 16a9.31 9.31 0 00-9.333 9.333A9.31 9.31 0 0032 34.667a9.31 9.31 0 009.333-9.334A9.31 9.31 0 0032 16z" fill="#1A73E8"></path>
- </g>
- <g id="family" fill="none" fill-rule="evenodd">
- <path fill="#4285F4" d="M31.833 2.667c-.966 0-1.933.366-2.7 1.066l-21.5 19.8c-.8.734-1.233 1.7-1.266 2.7l13.566 2.134L31.833 24l3.334-9.533-3.334-11.8z"></path>
- <path fill="#BDC1C6" d="M36.533 42.9L22.467 61.333H29.8c1.233 0 2.4-.566 3.167-1.566L45.833 42.9h-9.3zM6.4 48.033c-1.233 0-2.4.567-3.167 1.567l-.566.767 3.966.9L8.967 54.3l4.8-6.267H6.4z"></path>
- <path fill="#34A853" d="M31.833 24L6.367 26.233c-.067.934.2 1.867.8 2.667l7.466 9.767 2.034 2.666 8.566 2.567 6.6-3.9 3.334-8-3.334-8z"></path>
- <path fill="#FBBC04" d="M16.667 41.333L28.7 57.1a3.976 3.976 0 003.167 1.567l3.333-9.6L31.867 40l-15.2 1.333z"></path>
- <path fill="#DADCE0" d="M29.8 61.333c-1.233 0-2.4-.566-3.167-1.566l-7.8-10.2A3.978 3.978 0 0015.667 48H6.4c1.233 0 2.4.567 3.167 1.567l7.8 10.2a3.978 3.978 0 003.166 1.566H29.8z"></path>
- <path fill="#669DF6" d="M57.333 26.233a4.555 4.555 0 00-.3-1.333c-.2-.5-.533-.967-.966-1.367L34.567 3.7a4.12 4.12 0 00-2.734-1.033V24l12.734 4.467 12.766-2.234z"></path>
- <path fill="#5BB974" d="M57.333 26.233L31.833 24v16l7.367 3.9 7.833-2.567 2.034-2.666 7.433-9.734c.633-.8.867-1.766.833-2.7z"></path>
- <path fill="#FCC934" d="M31.833 58.667A4.023 4.023 0 0035 57.1l12.033-15.767L31.833 40v18.667z"></path>
- </g>
- </defs>
- </svg>
-</iron-iconset-svg>
-
<iron-iconset-svg name="oobe-96" size="96">
<svg>
<defs>
diff --git a/chrome/browser/resources/chromeos/login/components/oobe_network_icons.html b/chrome/browser/resources/chromeos/login/components/oobe_network_icons.html
index f2cc084c..79a0a01 100644
--- a/chrome/browser/resources/chromeos/login/components/oobe_network_icons.html
+++ b/chrome/browser/resources/chromeos/login/components/oobe_network_icons.html
@@ -30,23 +30,3 @@
</defs>
</svg>
</iron-iconset-svg>
-
-<iron-iconset-svg name="oobe-network-32" size="32">
- <svg>
- <defs>
- <g id="dialog-icon-wifi" fill-rule="evenodd">
- <path d="M1.333 12L4 14.667c6.627-6.627 17.373-6.627 24 0L30.667 12c-8.1-8.1-21.234-8.1-29.334 0zM12 22.667l4 4 4-4c-2.207-2.207-5.793-2.207-8 0zm-5.333-5.334L9.333 20c3.68-3.68 9.654-3.68 13.334 0l2.666-2.667c-5.153-5.153-13.513-5.153-18.666 0z"></path>
- </g>
- </defs>
- </svg>
-</iron-iconset-svg>
-
-<iron-iconset-svg name="oobe-network-64" size="64">
- <svg>
- <defs>
- <g id="dialog-icon-wifi" fill-rule="evenodd">
- <path d="M2.667 24L8 29.333c13.253-13.253 34.747-13.253 48 0L61.333 24C45.133 7.8 18.867 7.8 2.667 24zM24 45.333l8 8 8-8c-4.413-4.413-11.587-4.413-16 0zM13.333 34.667L18.667 40c7.36-7.36 19.306-7.36 26.666 0l5.334-5.333c-10.307-10.307-27.027-10.307-37.334 0z"></path>
- </g>
- </defs>
- </svg>
-</iron-iconset-svg>
diff --git a/chrome/browser/resources/chromeos/login/device_disabled.html b/chrome/browser/resources/chromeos/login/device_disabled.html
index df78006..eb84a7d 100644
--- a/chrome/browser/resources/chromeos/login/device_disabled.html
+++ b/chrome/browser/resources/chromeos/login/device_disabled.html
@@ -4,8 +4,9 @@

<link rel="import" href="chrome://resources/html/polymer.html">

+<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
+
<link rel="import" href="/components/common_styles.html">
-<link rel="import" href="/components/hd_iron_icon.html">
<link rel="import" href="/components/oobe_adaptive_dialog.html">
<link rel="import" href="/components/oobe_i18n_behavior.html">
<link rel="import" href="/components/oobe_dialog_host_behavior.html">
@@ -27,9 +28,7 @@
<oobe-adaptive-dialog title-key="deviceDisabledHeading" id="dialog"
role="dialog"
aria-label$="[[i18nDynamic(locale, 'deviceDisabledHeading')]]">
- <hd-iron-icon slot="icon"
- icon1x="oobe-32:warning" icon2x="oobe-64:warning">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:warning"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'deviceDisabledHeading')]]
</h1>
diff --git a/chrome/browser/resources/chromeos/login/enterprise_enrollment.html b/chrome/browser/resources/chromeos/login/enterprise_enrollment.html
index bd2e9de..f7fd151 100644
--- a/chrome/browser/resources/chromeos/login/enterprise_enrollment.html
+++ b/chrome/browser/resources/chromeos/login/enterprise_enrollment.html
@@ -2,13 +2,14 @@
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->

+<link rel="import" href="chrome://resources/html/polymer.html">
+
<link rel="import" href="chrome://oobe/custom_elements.html">
<link rel="import" href="chrome://resources/cr_elements/cr_input/cr_input.html">
<link rel="import" href="chrome://resources/html/action_link.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">

<link rel="import" href="/components/common_styles.html">
-<link rel="import" href="/components/hd_iron_icon.html">
<link rel="import" href="/components/oobe_adaptive_dialog.html">
<link rel="import" href="/components/oobe_i18n_behavior.html">
<link rel="import" href="/components/login_screen_behavior.html">
@@ -63,9 +64,7 @@

<!-- ENROLLMENT IN PROGRESS (SPINNER) DIALOG -->
<oobe-adaptive-dialog id="step-working" for-step="working">
- <hd-iron-icon slot="icon"
- icon1x="oobe-32:enterprise" icon2x="oobe-64:enterprise">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:enterprise"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'oauthEnrollScreenTitle')]]
</h1>
@@ -100,9 +99,7 @@
-->
<oobe-adaptive-dialog id="step-error" role="alert"
for-step="error, attribute-prompt-error, active-directory-join-error">
- <hd-iron-icon slot="icon"
- icon1x="oobe-32:warning"
- icon2x="oobe-64:warning"></hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:warning"></iron-icon>
<h1 slot="title">[[i18nDynamic(locale, 'oauthEnrollErrorTitle')]]</h1>
<div id="errorMsg" slot="subtitle">[[errorText_]]</div>
<div slot="content"
@@ -160,9 +157,7 @@
<!-- SUCCESS DIALOG -->
<oobe-adaptive-dialog id="step-success" for-step="success" role="alert"
footer-shrinkable>
- <hd-iron-icon slot="icon"
- icon1x="oobe-32:enterprise" icon2x="oobe-64:enterprise">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:enterprise"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'oauthEnrollSuccessTitle')]]
</h1>
@@ -197,9 +192,7 @@
<!-- ATTRIBUTE PROMPT DIALOG -->
<oobe-adaptive-dialog id="step-attribute-prompt"
for-step="attribute-prompt">
- <hd-iron-icon slot="icon"
- icon1x="oobe-32:enterprise" icon2x="oobe-64:enterprise">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:enterprise"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'oauthEnrollScreenTitle')]]
</h1>
diff --git a/chrome/browser/resources/chromeos/login/family_link_notice.html b/chrome/browser/resources/chromeos/login/family_link_notice.html
index ef2b793..442e3da 100644
--- a/chrome/browser/resources/chromeos/login/family_link_notice.html
+++ b/chrome/browser/resources/chromeos/login/family_link_notice.html
@@ -2,13 +2,15 @@
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->

+<link rel="import" href="chrome://resources/html/polymer.html">
+
<link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
<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://oobe/custom_elements.html">

<link rel="import" href="/components/common_styles.html">
-<link rel="import" href="/components/hd_iron_icon.html">
<link rel="import" href="/components/oobe_adaptive_dialog.html">
<link rel="import" href="/components/oobe_i18n_behavior.html">
<link rel="import" href="/components/oobe_dialog_host_behavior.html">
@@ -19,8 +21,7 @@
<style include="oobe-dialog-host"></style>
<oobe-adaptive-dialog id="familyLinkDialog" role="dialog"
aria-label$="[[getDialogTitle_(locale, email_, domain_)]]">
- <hd-iron-icon slot="icon" icon1x="oobe-32:family" icon2x="oobe-64:family">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:family"></iron-icon>
<h1 slot="title">[[getDialogTitle_(locale, email_, domain_)]]</h1>
<div slot="subtitle">
[[getDialogSubtitle_(locale, isNewGaiaAccount_, email_, domain_)]]
diff --git a/chrome/browser/resources/chromeos/login/fingerprint_setup.html b/chrome/browser/resources/chromeos/login/fingerprint_setup.html
index f60aea7..ccf205f 100644
--- a/chrome/browser/resources/chromeos/login/fingerprint_setup.html
+++ b/chrome/browser/resources/chromeos/login/fingerprint_setup.html
@@ -10,7 +10,6 @@
<link rel="import" href="chrome://resources/cr_elements/cr_lottie/cr_lottie.html">

<link rel="import" href="/components/common_styles.html">
-<link rel="import" href="/components/hd_iron_icon.html">
<link rel="import" href="/components/oobe_adaptive_dialog.html">
<link rel="import" href="/components/oobe_i18n_behavior.html">
<link rel="import" href="/components/oobe_dialog_host_behavior.html">
@@ -42,9 +41,7 @@
<p slot="subtitle">
[[i18nDynamic(locale, 'setupFingerprintScreenDescription')]]
</p>
- <hd-iron-icon slot="icon"
- icon1x="oobe-32:fingerprint" icon2x="oobe-64:fingerprint">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:fingerprint"></iron-icon>
<div slot="content" class="flex layout vertical center center-justified">
<div id="sensorLocationContainer" class="oobe-illustration">
<template is="dom-if" if="[[shouldUseLottieAnimation_]]">
@@ -67,9 +64,7 @@
<oobe-adaptive-dialog id="startFingerprintEnroll" role="dialog" for-step="progress"
footer-shrinkable
aria-label$="[[i18nDynamic(locale, 'enrollmentProgressScreenTitle')]]">
- <hd-iron-icon slot="icon"
- icon1x="oobe-32:fingerprint" icon2x="oobe-64:fingerprint">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:fingerprint"></iron-icon>
<h1 slot="title" hidden="[[complete_]]">
[[i18nDynamic(locale, 'enrollmentProgressScreenTitle')]]
</h1>
diff --git a/chrome/browser/resources/chromeos/login/gesture_navigation.html b/chrome/browser/resources/chromeos/login/gesture_navigation.html
index e6043c7..b604f3d 100644
--- a/chrome/browser/resources/chromeos/login/gesture_navigation.html
+++ b/chrome/browser/resources/chromeos/login/gesture_navigation.html
@@ -5,6 +5,7 @@
<link rel="import" href="chrome://resources/html/polymer.html">

<link rel="import" href="chrome://resources/cr_elements/cr_lottie/cr_lottie.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">

<link rel="import" href="/components/common_styles.html">
<link rel="import" href="/components/oobe_adaptive_dialog.html">
@@ -28,10 +29,10 @@
}

.gesture-list-item-icon {
+ --iron-icon-height: 24px;
+ --iron-icon-width: 24px;
align-self: flex-start;
- height: 24px;
margin: auto;
- width: 24px;
}

.gesture-list-item-text {
@@ -43,26 +44,30 @@
<oobe-adaptive-dialog id="gestureIntro" for-step="gestureIntro"
role="dialog"
aria-label$="[[i18nDynamic(locale, 'gestureNavigationIntroTitle')]]">
- <img slot="icon" src="images/gestures.svg" width="32" height="32">
+ <iron-icon slot="icon" icon="oobe-32:gestures"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'gestureNavigationIntroTitle')]]
</h1>
<div slot="content" class="landscape-header-aligned
portrait-horizontal-centered">
<div class="gesture-list-item">
- <img class="gesture-list-item-icon" src="images/home.svg">
+ <iron-icon class="gesture-list-item-icon" icon="oobe-32:gesture-home">
+ </iron-icon>
<div class="gesture-list-item-text">
[[i18nDynamic(locale, 'gestureNavigationIntroGoHomeItem')]]
</div>
</div>
<div class="gesture-list-item">
- <img class="gesture-list-item-icon" src="images/overview.svg">
+ <iron-icon class="gesture-list-item-icon"
+ icon="oobe-32:gesture-overview">
+ </iron-icon>
<div class="gesture-list-item-text">
[[i18nDynamic(locale, 'gestureNavigationIntroSwitchAppItem')]]
</div>
</div>
<div class="gesture-list-item">
- <img class="gesture-list-item-icon" src="images/back.svg">
+ <iron-icon class="gesture-list-item-icon" icon="oobe-32:gesture-back">
+ </iron-icon>
<div class="gesture-list-item-text">
[[i18nDynamic(locale, 'gestureNavigationIntroGoBackItem')]]
</div>
@@ -78,7 +83,7 @@

<oobe-adaptive-dialog id="gestureHome" for-step="gestureHome" role="dialog"
aria-label$="[[i18nDynamic(locale, 'gestureNavigationHomeTitle')]]">
- <img slot="icon" src="images/home.svg" width="32" height="32">
+ <iron-icon slot="icon" icon="oobe-32:gesture-home"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'gestureNavigationHomeTitle')]]
</h1>
@@ -105,7 +110,7 @@
<oobe-adaptive-dialog id="gestureOverview" for-step="gestureOverview"
role="dialog"
aria-label$="[[i18nDynamic(locale, 'gestureNavigationOverviewTitle')]]">
- <img slot="icon" src="images/overview.svg" width="32" height="32">
+ <iron-icon slot="icon" icon="oobe-32:gesture-overview"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'gestureNavigationOverviewTitle')]]
</h1>
@@ -131,7 +136,7 @@

<oobe-adaptive-dialog id="gestureBack" for-step="gestureBack" role="dialog"
aria-label$="[[i18nDynamic(locale, 'gestureNavigationBackTitle')]]">
- <img slot="icon" src="images/back.svg" width="32" height="32">
+ <iron-icon slot="icon" icon="oobe-32:gesture-back"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'gestureNavigationBackTitle')]]
</h1>
diff --git a/chrome/browser/resources/chromeos/login/images/back.svg b/chrome/browser/resources/chromeos/login/images/back.svg
deleted file mode 100644
index 4be1786..0000000
--- a/chrome/browser/resources/chromeos/login/images/back.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48 48"><defs><path id="a" d="M32 14H7.66L18.84 2.82 16 0 0 16l16 16 2.82-2.82L7.66 18H32z"/></defs><g fill="none" fill-rule="evenodd" transform="translate(8 8)"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g fill="#1A73E8" mask="url(#b)"><path d="M-8-8h48v48H-8z"/></g></g></svg>
\ No newline at end of file
diff --git a/chrome/browser/resources/chromeos/login/images/gestures.svg b/chrome/browser/resources/chromeos/login/images/gestures.svg
deleted file mode 100644
index 8267212..0000000
--- a/chrome/browser/resources/chromeos/login/images/gestures.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><g fill="none" fill-rule="evenodd"><path d="M0 0h59.077v59.077H0z"/><path fill="#1A73E8" d="M33.23.025a6.106 6.106 0 0 1 5.072 2.683 6.051 6.051 0 0 1 2.313-.443 6.156 6.156 0 0 1 6.154 6.153v.69a6.156 6.156 0 0 1 7.385 6.03v14.4H49.23v-14.4c0-.689-.542-1.23-1.231-1.23-.69 0-1.23.541-1.23 1.23v14.4h-4.924V8.418c0-.689-.541-1.23-1.23-1.23-.69 0-1.231.541-1.231 1.23v21.12h-4.923V6.178c0-.689-.542-1.23-1.231-1.23-.69 0-1.231.541-1.231 1.23v23.36h-4.923V11.791c0-.69-.542-1.231-1.23-1.231-.69 0-1.232.566-1.232 1.23v31.68l-13.169-6.965-1.255 1.107 14.424 15.016c.936.96 2.216 1.526 3.545 1.526H32v4.923h-3.815a9.948 9.948 0 0 1-7.114-3.028L3.1 37.317l5.096-4.505a4.928 4.928 0 0 1 5.563-.664l5.932 3.15V11.791a6.156 6.156 0 0 1 6.154-6.154c.419 0 .837.05 1.256.123.221-3.2 2.88-5.735 6.129-5.735z"/><path fill="#1A73E8" d="M52.302 41.698l2.313 5.071 2.314-5.07L62 39.384l-5.07-2.314L54.614 32l-2.313 5.07-5.071 2.315 5.07 2.313zM41.222 5
7.24L44.309 64l3.085-6.761 6.76-3.085-6.76-3.085-3.085-6.761-3.085 6.76-6.761 3.086 6.76 3.085z"/></g></svg>
\ No newline at end of file
diff --git a/chrome/browser/resources/chromeos/login/images/home.svg b/chrome/browser/resources/chromeos/login/images/home.svg
deleted file mode 100644
index 373f88a..0000000
--- a/chrome/browser/resources/chromeos/login/images/home.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48 48"><defs><path id="a" d="M16 0L0 12v24h32V12L16 0zm12 32h-6V20H10v12H4V14l12-9 12 9v18z"/></defs><g fill="none" fill-rule="evenodd" transform="translate(8 6)"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g fill="#1A73E8" mask="url(#b)"><path d="M-8-6h48v48H-8z"/></g></g></svg>
\ No newline at end of file
diff --git a/chrome/browser/resources/chromeos/login/images/overview.svg b/chrome/browser/resources/chromeos/login/images/overview.svg
deleted file mode 100644
index 7bcb80d..0000000
--- a/chrome/browser/resources/chromeos/login/images/overview.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 64 64"><path fill="#fff" d="M0 0h64v64H0z"/><path fill="#1A73E8" fill-rule="evenodd" d="M4 15.2h33.6v33.6H4V15.2zm28 5.6H9.6v22.4H32V20.8z" clip-rule="evenodd"/><path fill="#1A73E8" d="M48.8 15.2h-5.6v33.6h5.6V15.2zm11.2 0h-5.6v33.6H60V15.2z"/></svg>
\ No newline at end of file
diff --git a/chrome/browser/resources/chromeos/login/marketing_opt_in.html b/chrome/browser/resources/chromeos/login/marketing_opt_in.html
index d99a281..d5ea1a7 100644
--- a/chrome/browser/resources/chromeos/login/marketing_opt_in.html
+++ b/chrome/browser/resources/chromeos/login/marketing_opt_in.html
@@ -2,37 +2,18 @@
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->

+<link rel="import" href="chrome://resources/html/polymer.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/cr_lottie/cr_lottie.html">

<link rel="import" href="/components/common_styles.html">
-<link rel="import" href="/components/hd_iron_icon.html">
<link rel="import" href="/components/oobe_adaptive_dialog.html">
<link rel="import" href="/components/oobe_i18n_behavior.html">
<link rel="import" href="/components/oobe_dialog_host_behavior.html">
<link rel="import" href="/components/login_screen_behavior.html">

-<iron-iconset-svg name="marketing-opt-in-32" size="32">
- <svg>
- <defs>
- <g id="accessibility" fill-rule="evenodd">
- <path d="M16 2.667c1.467 0 2.667 1.184 2.667 2.633 0 1.448-1.2 2.632-2.667 2.632-1.467 0-2.667-1.184-2.667-2.632 0-1.45 1.2-2.633 2.667-2.633zm4 9.215v16.785h-3v-7.9h-2v7.9h-3V11.882H4V8.92h24v2.962h-8z"></path>
- </g>
- </defs>
- </svg>
-</iron-iconset-svg>
-
-<iron-iconset-svg name="marketing-opt-in-64" size="64">
- <svg>
- <defs>
- <g id="accessibility" fill-rule="evenodd">
- <path d="M32 5.333c2.933 0 5.333 2.415 5.333 5.367 0 2.95-2.4 5.366-5.333 5.366-2.933 0-5.333-2.415-5.333-5.366 0-2.952 2.4-5.367 5.333-5.367zM40 24v35h-5V43h-6v16.006h-5V24H8v-4.915h48V24H40z"></path>
- </g>
- </defs>
- </svg>
-</iron-iconset-svg>
-
<dom-module id="marketing-opt-in-element">
<template>
<style include="oobe-dialog-host">
@@ -58,12 +39,12 @@
hidden="[[isAccessibilitySettingsShown_]]"
aria-label$="[[i18nDynamic(locale, 'marketingOptInScreenTitle')]]"
aria-describedby="marketing-opt-in-subtitle">
- <hd-iron-icon slot="icon" hidden="[[newLayoutEnabled_]]"
- icon1x="oobe-32:checkmark" icon2x="oobe-32:checkmark">
- </hd-iron-icon>
- <hd-iron-icon slot="icon" hidden="[[!newLayoutEnabled_]]"
- icon1x="oobe-32:checkmarkv2" icon2x="oobe-32:checkmarkv2">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:checkmark"
+ hidden="[[newLayoutEnabled_]]">
+ </iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:checkmarkv2"
+ hidden="[[!newLayoutEnabled_]]">
+ </iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'marketingOptInScreenTitle')]]
</h1>
@@ -97,8 +78,7 @@
<div class="marketing-option layout horizontal center"
hidden="[[!marketingOptInVisible_]]"
id="marketing-opt-in-toggle">
- <hd-iron-icon icon1x="oobe-32:chromebook" icon2x="oobe-64:chromebook">
- </hd-iron-icon>
+ <iron-icon icon="oobe-32:chromebook"></iron-icon>
<div id="chromebookUpdatesOptionLabel" class="flex" aria-hidden="true">
[[i18nDynamic(locale, 'marketingOptInGetChromebookUpdates')]]
</div>
@@ -139,8 +119,8 @@
hidden="[[!isA11ySettingsButtonVisible_]]"
id="marketing-opt-in-accessibility-button"
on-click="onToggleAccessibilityPage_"
- icon1x="marketing-opt-in-32:accessibility"
- icon2x="marketing-opt-in-64:accessibility"
+ icon1x="oobe-32:accessibility"
+ icon2x="oobe-32:accessibility"
text-key="marketingOptInA11yButtonLabel">
</oobe-welcome-secondary-button>
<oobe-text-button slot="bottom-buttons"
@@ -153,10 +133,8 @@
<oobe-adaptive-dialog id="finalAccessibilityPage" role="dialog"
hidden="[[!isAccessibilitySettingsShown_]]"
aria-label$="[[i18nDynamic(locale, 'finalA11yPageTitle')]]">
- <hd-iron-icon slot="icon"
- icon1x="marketing-opt-in-32:accessibility"
- icon2x="marketing-opt-in-64:accessibility">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:accessibility">
+ </iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'finalA11yPageTitle')]]
</h1>
diff --git a/chrome/browser/resources/chromeos/login/offline_ad_login.html b/chrome/browser/resources/chromeos/login/offline_ad_login.html
index 0cc60bd..6d619c9 100644
--- a/chrome/browser/resources/chromeos/login/offline_ad_login.html
+++ b/chrome/browser/resources/chromeos/login/offline_ad_login.html
@@ -3,12 +3,13 @@
found in the LICENSE file. -->

<link rel="import" href="chrome://resources/html/polymer.html">
+
<link rel="import" href="chrome://resources/html/i18n_behavior.html">
<link rel="import" href="chrome://resources/cr_elements/md_select_css.html">
<link rel="import" href="chrome://resources/cr_elements/icons.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">

<link rel="import" href="/components/common_styles.html">
-<link rel="import" href="/components/hd_iron_icon.html">
<link rel="import" href="/components/oobe_adaptive_dialog.html">
<link rel="import" href="/components/oobe_i18n_behavior.html">
<link rel="import" href="/components/login_screen_behavior.html">
@@ -108,9 +109,7 @@
</style>
<oobe-adaptive-dialog id="unlockStep" for-step="unlock" role="dialog"
aria-label$="[[i18nDynamic(locale, adWelcomeMessageKey)]]">
- <hd-iron-icon slot="icon"
- icon1x="oobe-32:enterprise" icon2x="oobe-64:enterprise">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:enterprise"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'adUnlockTitle')]]
</h1>
@@ -135,9 +134,9 @@
</oobe-adaptive-dialog>
<oobe-adaptive-dialog id="credsStep" for-step="creds" role="dialog"
aria-label$="[[i18nDynamic(locale, adWelcomeMessageKey)]]">
- <hd-iron-icon slot="icon" hidden="[[!isDomainJoin]]"
- icon1x="oobe-32:enterprise" icon2x="oobe-64:enterprise">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:enterprise"
+ hidden="[[!isDomainJoin]]">
+ </iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, adWelcomeMessageKey)]]
</h1>
diff --git a/chrome/browser/resources/chromeos/login/oobe_adb_sideloading_screen.html b/chrome/browser/resources/chromeos/login/oobe_adb_sideloading_screen.html
index 3ab27af..dafa090 100644
--- a/chrome/browser/resources/chromeos/login/oobe_adb_sideloading_screen.html
+++ b/chrome/browser/resources/chromeos/login/oobe_adb_sideloading_screen.html
@@ -2,10 +2,12 @@
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->

+<link rel="import" href="chrome://resources/html/polymer.html">
+
<link rel="import" href="chrome://resources/html/action_link.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">

<link rel="import" href="/components/common_styles.html">
-<link rel="import" href="/components/hd_iron_icon.html">
<link rel="import" href="/components/oobe_adaptive_dialog.html">
<link rel="import" href="/components/oobe_dialog_host_behavior.html">
<link rel="import" href="/components/login_screen_behavior.html">
@@ -19,9 +21,7 @@
<oobe-adaptive-dialog id="enableAdbSideloadDialog" role="dialog"
for-step="setup" footer-shrinkable
aria-label$="[[i18nDynamic(locale, 'enableAdbSideloadingSetupTitle')]]">
- <hd-iron-icon slot="icon"
- icon1x="oobe-32:alert" icon2x="oobe-64:alert">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:alert"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'enableAdbSideloadingSetupTitle')]]
</h1>
@@ -53,9 +53,7 @@
<oobe-adaptive-dialog id="enableAdbSideloadErrorDialog" role="dialog"
for-step="error" footer-shrinkable
aria-label$="[[i18nDynamic(locale, 'enableAdbSideloadingSetupTitle')]]">
- <hd-iron-icon slot="icon"
- icon1x="oobe-32:warning" icon2x="oobe-64:warning">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:warning"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'enableAdbSideloadingErrorTitle')]]
</h1>
diff --git a/chrome/browser/resources/chromeos/login/oobe_reset.html b/chrome/browser/resources/chromeos/login/oobe_reset.html
index 83ba0aa..16993dc 100644
--- a/chrome/browser/resources/chromeos/login/oobe_reset.html
+++ b/chrome/browser/resources/chromeos/login/oobe_reset.html
@@ -2,13 +2,14 @@
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->

+<link rel="import" href="chrome://resources/html/polymer.html">
+
<link rel="import" href="chrome://resources/cr_elements/cr_checkbox/cr_checkbox.html">
<link rel="import" href="chrome://resources/html/action_link.html">
<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="/components/common_styles.html">
-<link rel="import" href="/components/hd_iron_icon.html">
<link rel="import" href="/components/oobe_adaptive_dialog.html">
<link rel="import" href="/components/oobe_dialog_host_behavior.html">
<link rel="import" href="/components/oobe_i18n_behavior.html">
@@ -41,9 +42,7 @@
<oobe-adaptive-dialog id="resetDialog" role="dialog"
aria-label$="[[i18nDynamic(locale, 'resetScreenAccessibleTitle')]]"
footer-shrinkable>
- <hd-iron-icon slot="icon"
- icon1x="oobe-32:alert" icon2x="oobe-64:alert">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:alert"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'resetWarningTitle')]]
</h1>
diff --git a/chrome/browser/resources/chromeos/login/oobe_screen_autolaunch.html b/chrome/browser/resources/chromeos/login/oobe_screen_autolaunch.html
index 29dee63..1e4323c 100644
--- a/chrome/browser/resources/chromeos/login/oobe_screen_autolaunch.html
+++ b/chrome/browser/resources/chromeos/login/oobe_screen_autolaunch.html
@@ -1,7 +1,8 @@
<link rel="import" href="chrome://resources/html/polymer.html">

+<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
+
<link rel="import" href="/components/common_styles.html">
-<link rel="import" href="/components/hd_iron_icon.html">
<link rel="import" href="/components/oobe_adaptive_dialog.html">
<link rel="import" href="/components/oobe_i18n_behavior.html">
<link rel="import" href="/components/oobe_dialog_host_behavior.html">
@@ -17,8 +18,7 @@
</style>
<oobe-adaptive-dialog id="autolaunch" role="dialog"
aria-label$="[[i18nDynamic(locale, 'autolaunchTitle')]]">
- <hd-iron-icon slot="icon" icon1x="oobe-32:alert" icon2x="oobe-64:alert">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:alert"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'demoSetupProgressScreenTitle')]]
</h1>
diff --git a/chrome/browser/resources/chromeos/login/oobe_update.html b/chrome/browser/resources/chromeos/login/oobe_update.html
index f3e6b920..a38aca0 100644
--- a/chrome/browser/resources/chromeos/login/oobe_update.html
+++ b/chrome/browser/resources/chromeos/login/oobe_update.html
@@ -2,12 +2,13 @@
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->

+<link rel="import" href="chrome://resources/html/polymer.html">
+
<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-progress/paper-progress.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html">

<link rel="import" href="/components/common_styles.html">
-<link rel="import" href="/components/hd_iron_icon.html">
<link rel="import" href="/components/oobe_carousel.html">
<link rel="import" href="/components/oobe_slide.html">
<link rel="import" href="/components/oobe_i18n_behavior.html">
@@ -52,9 +53,7 @@
<oobe-adaptive-dialog for-step="cellular" tabindex="0"
aria-live="polite" footer-shrinkable
id="cellular-permission-dialog">
- <hd-iron-icon slot="icon"
- icon1x="oobe-32:googleg" icon2x="oobe-64:googleg">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:googleg"></iron-icon>
<h1 slot="title">
[[i18nRecursive(locale, 'updateOverCellularPromptTitle',
'productName')]]
@@ -78,9 +77,7 @@
</oobe-adaptive-dialog>
<oobe-adaptive-dialog footer-shrinkable id="checking-for-updates-dialog"
for-step="checking" aria-live="polite">
- <hd-iron-icon slot="icon"
- icon1x="oobe-32:googleg" icon2x="oobe-64:googleg">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:googleg"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'checkingForUpdates')]]
</h1>
@@ -94,9 +91,7 @@
</oobe-adaptive-dialog>
<oobe-adaptive-dialog footer-shrinkable id="update-in-progress-dialog"
for-step="update" aria-live="polite">
- <hd-iron-icon slot="icon"
- icon1x="oobe-32:googleg" icon2x="oobe-64:googleg">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:googleg"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'updateStatusTitle')]]
</h1>
@@ -179,9 +174,7 @@
</oobe-loading-dialog>
<oobe-adaptive-dialog footer-shrinkable id="better-update-complete-dialog"
for-step="reboot" aria-live="polite">
- <hd-iron-icon slot="icon"
- icon1x="oobe-32:googleg" icon2x="oobe-64:googleg">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:googleg"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'updateCompeletedMsg')]]
</h1>
diff --git a/chrome/browser/resources/chromeos/login/oobe_welcome.html b/chrome/browser/resources/chromeos/login/oobe_welcome.html
index 8aa532a..1c3749d 100644
--- a/chrome/browser/resources/chromeos/login/oobe_welcome.html
+++ b/chrome/browser/resources/chromeos/login/oobe_welcome.html
@@ -2,6 +2,8 @@
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->

+<link rel="import" href="chrome://resources/html/polymer.html">
+
<link rel="import" href="chrome://resources/cr_elements/cr_input/cr_input.html">
<link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
<link rel="import" href="chrome://resources/html/i18n_behavior.html">
@@ -9,7 +11,6 @@
<link rel="import" href="chrome://resources/polymer/v1_0/iron-iconset-svg/iron-iconset-svg.html">

<link rel="import" href="/components/common_styles.html">
-<link rel="import" href="/components/hd_iron_icon.html">
<link rel="import" href="/components/oobe_i18n_behavior.html">
<link rel="import" href="/components/oobe_adaptive_dialog.html">
<link rel="import" href="/components/login_screen_behavior.html">
@@ -36,30 +37,6 @@
</svg>
</iron-iconset-svg>

-<iron-iconset-svg name="oobe-welcome-64" size="64">
- <svg>
- <defs>
- <g id="accessibility" fill-rule="evenodd">
- <path d="M32 5.333c2.933 0 5.333 2.415 5.333 5.367 0 2.95-2.4 5.366-5.333 5.366-2.933 0-5.333-2.415-5.333-5.366 0-2.952 2.4-5.367 5.333-5.367zM40 24v35h-5V43h-6v16.006h-5V24H8v-4.915h48V24H40z"></path>
- </g>
- <g id="language" fill-rule="evenodd">
- <text font-family="RobotoMono-Regular, Roboto Mono" font-size="20" transform="translate(0 -71)">
- <tspan x="1" y="19">Language</tspan>
- </text>
- <path d="M31.973 5.333C17.253 5.333 5.333 17.28 5.333 32c0 14.72 11.92 26.667 26.64 26.667C46.72 58.667 58.667 46.72 58.667 32c0-14.72-11.947-26.667-26.694-26.667zm18.48 16h-7.866c-.854-3.333-2.08-6.533-3.68-9.493 4.906 1.68 8.986 5.093 11.546 9.493zM32 10.773c2.213 3.2 3.947 6.747 5.093 10.56H26.907c1.146-3.813 2.88-7.36 5.093-10.56zm-20.64 26.56c-.427-1.706-.693-3.493-.693-5.333 0-1.84.266-3.627.693-5.333h9.013C20.16 28.427 20 30.187 20 32c0 1.813.16 3.573.373 5.333H11.36zm2.187 5.334h7.866c.854 3.333 2.08 6.533 3.68 9.493-4.906-1.68-8.986-5.067-11.546-9.493zm7.866-21.334h-7.866c2.56-4.426 6.64-7.813 11.546-9.493-1.6 2.96-2.826 6.16-3.68 9.493zM32 53.227c-2.213-3.2-3.947-6.747-5.093-10.56h10.186c-1.146 3.813-2.88 7.36-5.093 10.56zm6.24-15.894H25.76c-.24-1.76-.427-3.52-.427-5.333 0-1.813.187-3.6.427-5.333h12.48c.24 1.733.427 3.52.427 5.333 0 1.813-.187 3.573-.427 5.333zm.667 14.827c1.6-2.96 2.826-6.16 3.68-9.493h7.866c-2.56 4.4-6.64 7.813-11.546 9.493zm4.72-14.827c.213-1.76
.373-3.52.373-5.333 0-1.813-.16-3.573-.373-5.333h9.013c.427 1.706.693 3.493.693 5.333 0 1.84-.266 3.627-.693 5.333h-9.013z"></path>
- </g>
- <g id="settings" fill="none" fill-rule="evenodd">
- <path d="M0 0h64v64H0z"></path>
- <path d="M51.813 34.6c.107-.853.187-1.72.187-2.6 0-.88-.08-1.747-.187-2.6l5.64-4.413c.507-.4.654-1.12.32-1.707l-5.333-9.24a1.32 1.32 0 0 0-1.627-.573l-6.64 2.68a20.234 20.234 0 0 0-4.506-2.627l-1-7.067a1.371 1.371 0 0 0-1.334-1.12H26.667c-.667 0-1.214.494-1.32 1.12l-1 7.067a19.734 19.734 0 0 0-4.507 2.627l-6.64-2.68c-.6-.227-1.293 0-1.627.573L6.24 23.28a1.336 1.336 0 0 0 .32 1.707l5.627 4.413C12.08 30.253 12 31.12 12 32c0 .88.08 1.747.187 2.6L6.56 39.013a1.33 1.33 0 0 0-.32 1.707l5.333 9.24c.334.573 1.027.813 1.627.573l6.64-2.68a20.234 20.234 0 0 0 4.507 2.627l1 7.067c.106.626.653 1.12 1.32 1.12h10.666c.667 0 1.214-.494 1.32-1.12l1-7.067a19.734 19.734 0 0 0 4.507-2.627l6.64 2.68c.6.227 1.293 0 1.627-.573l5.333-9.24a1.336 1.336 0 0 0-.32-1.707L51.813 34.6zM32 41.333A9.327 9.327 0 0 1 22.667 32 9.327 9.327 0 0 1 32 22.667 9.327 9.327 0 0 1 41.333 32 9.327 9.327 0 0 1 32 41.333z" fill="#4285F4" fill-rule="nonzero"></path>
- </g>
- <g id="timezone" fill-rule="evenodd">
- <path d="M31.987 5.333C17.253 5.333 5.333 17.267 5.333 32c0 14.733 11.92 26.667 26.654 26.667 14.733 0 26.68-11.934 26.68-26.667 0-14.733-11.947-26.667-26.68-26.667zm.013 48c-11.787 0-21.333-9.546-21.333-21.333 0-11.787 9.546-21.333 21.333-21.333 11.787 0 21.333 9.546 21.333 21.333 0 11.787-9.546 21.333-21.333 21.333z"></path>
- <path d="M33.333 18.667h-4v16l13.987 8.4 2.013-3.28-12-7.12"></path>
- </g>
- </defs>
- </svg>
-</iron-iconset-svg>
-
<dom-module id="oobe-welcome-element">
<template>
<style include="oobe-dialog-host">
@@ -134,9 +111,7 @@
</oobe-welcome-dialog>
<oobe-adaptive-dialog id="languageScreen" role="dialog" for-step="language"
aria-label$="[[i18nDynamic(locale, 'languageSectionTitle')]]">
- <hd-iron-icon slot="icon"
- icon1x="oobe-welcome-32:language" icon2x="oobe-welcome-64:language">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:language"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'languageSectionTitle')]]
</h1>
@@ -174,10 +149,7 @@
<oobe-adaptive-dialog id="accessibilityScreen" role="dialog"
for-step="accessibility"
aria-label$="[[i18nDynamic(locale, 'accessibilitySectionTitle')]]">
- <hd-iron-icon slot="icon"
- icon1x="oobe-welcome-32:accessibility"
- icon2x="oobe-welcome-64:accessibility">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:accessibility"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'accessibilitySectionTitle')]]
</h1>
@@ -294,9 +266,7 @@
</oobe-adaptive-dialog>
<oobe-adaptive-dialog id="timezoneScreen" role="dialog" for-step="timezone"
aria-label$="[[i18nDynamic(locale, 'timezoneSectionTitle')]]">
- <hd-iron-icon slot="icon"
- icon1x="oobe-welcome-32:timezone" icon2x="oobe-welcome-64:timezone">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:timezone"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'timezoneSectionTitle')]]
</h1>
@@ -321,9 +291,7 @@
<oobe-adaptive-dialog id="oobeAdvancedOptionsScreen" role="dialog"
for-step="advanced-options"
aria-label$="[[i18nDynamic(locale, 'advancedOptionsSectionTitle')]]">
- <hd-iron-icon slot="icon"
- icon1x="oobe-welcome-32:settings" icon2x="oobe-welcome-64:settings">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:gear"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'advancedOptionsSectionTitle')]]
</h1>
diff --git a/chrome/browser/resources/chromeos/login/oobe_welcome_dialog.html b/chrome/browser/resources/chromeos/login/oobe_welcome_dialog.html
index 688bad5..a57b7a7 100644
--- a/chrome/browser/resources/chromeos/login/oobe_welcome_dialog.html
+++ b/chrome/browser/resources/chromeos/login/oobe_welcome_dialog.html
@@ -12,7 +12,6 @@
<link rel="import" href="/components/oobe_i18n_behavior.html">
<link rel="import" href="/components/oobe_dialog.html">

-
<!--
OOBE Welcome screen
-->
@@ -211,8 +210,8 @@
</oobe-welcome-secondary-button>
<oobe-welcome-secondary-button id="newTimezoneSettingsButton"
text-key="timezoneButtonText"
- icon1x="oobe-welcome-32:timezone"
- icon2x="oobe-welcome-64:timezone"
+ icon1x="oobe-32:timezone"
+ icon2x="oobe-32:timezone"
on-click="onTimezoneClicked_"
hidden="[[!timezoneButtonVisible]]">
</oobe-welcome-secondary-button>
@@ -313,8 +312,8 @@
on-click="onAccessibilityClicked_"></oobe-welcome-secondary-button>
<oobe-welcome-secondary-button id="timezoneSettingsButton"
text-key="timezoneButtonText"
- icon1x="oobe-welcome-32:timezone"
- icon2x="oobe-welcome-64:timezone"
+ icon1x="oobe-32:timezone"
+ icon2x="oobe-32:timezone"
on-click="onTimezoneClicked_"
hidden="[[!timezoneButtonVisible]]"></oobe-welcome-secondary-button>
</div>
diff --git a/chrome/browser/resources/chromeos/login/parental_handoff.html b/chrome/browser/resources/chromeos/login/parental_handoff.html
index 6f707d2..e740964 100644
--- a/chrome/browser/resources/chromeos/login/parental_handoff.html
+++ b/chrome/browser/resources/chromeos/login/parental_handoff.html
@@ -2,11 +2,14 @@
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->

-<link rel="import" href="chrome://oobe/custom_elements.html">
+<link rel="import" href="chrome://resources/html/polymer.html">
+
<link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
+
+<link rel="import" href="chrome://oobe/custom_elements.html">

<link rel="import" href="/components/common_styles.html">
-<link rel="import" href="/components/hd_iron_icon.html">
<link rel="import" href="/components/oobe_adaptive_dialog.html">
<link rel="import" href="/components/oobe_i18n_behavior.html">
<link rel="import" href="/components/oobe_dialog_host_behavior.html">
@@ -17,9 +20,7 @@
<style include="oobe-dialog-host"></style>
<oobe-adaptive-dialog id="parentalHandoffDialog" role="dialog"
aria-label$="[[i18nDynamic(locale, 'parentalHandoffDialogTitle', username_)]]">
- <hd-iron-icon icon1x="oobe-32:googleg" icon2x="oobe-64:googleg"
- slot="icon">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:googleg"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'parentalHandoffDialogTitle', username_)]]
</h1>
diff --git a/chrome/browser/resources/chromeos/login/pin_setup.html b/chrome/browser/resources/chromeos/login/pin_setup.html
index 4223d923..fa795ac 100644
--- a/chrome/browser/resources/chromeos/login/pin_setup.html
+++ b/chrome/browser/resources/chromeos/login/pin_setup.html
@@ -2,17 +2,16 @@
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->

-<link rel="import" href="chrome://resources/cr_elements/shared_style_css.html">
+<link rel="import" href="chrome://resources/html/polymer.html">

-<link rel="import" href="chrome://resources/html/i18n_behavior.html">
-
-<link rel="import" href="chrome://resources/html/assert.html">
-<link rel="import" href="chrome://resources/html/i18n_behavior.html">
<link rel="import" href="chrome://resources/cr_components/chromeos/quick_unlock/setup_pin_keyboard.html">
<link rel="import" href="chrome://resources/cr_elements/cr_input/cr_input.html">
+<link rel="import" href="chrome://resources/cr_elements/shared_style_css.html">
+<link rel="import" href="chrome://resources/html/assert.html">
+<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="/components/common_styles.html">
-<link rel="import" href="/components/hd_iron_icon.html">
<link rel="import" href="/components/oobe_adaptive_dialog.html">
<link rel="import" href="/components/oobe_dialog_host_behavior.html">
<link rel="import" href="/components/login_screen_behavior.html">
@@ -26,8 +25,7 @@
}
</style>
<oobe-adaptive-dialog id="setup" role="dialog" for-step="start,confirm">
- <hd-iron-icon slot="icon" icon1x="oobe-32:lock" icon2x="oobe-64:lock">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:lock"></iron-icon>
<h1 slot="title" for-step="start">
[[i18nDynamic(locale, 'discoverPinSetupTitle1')]]
</h1>
@@ -69,8 +67,7 @@
</oobe-adaptive-dialog>
<oobe-adaptive-dialog id="setup" role="dialog" for-step="done"
footer-shrinkable>
- <hd-iron-icon slot="icon" icon1x="oobe-32:lock" icon2x="oobe-64:lock">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:lock"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'discoverPinSetupTitle3')]]
</h1>
diff --git a/chrome/browser/resources/chromeos/login/saml_confirm_password.html b/chrome/browser/resources/chromeos/login/saml_confirm_password.html
index b57502b..34a5b70 100644
--- a/chrome/browser/resources/chromeos/login/saml_confirm_password.html
+++ b/chrome/browser/resources/chromeos/login/saml_confirm_password.html
@@ -7,9 +7,9 @@
<link rel="import" href="chrome://resources/cr_elements/shared_style_css.html">
<link rel="import" href="chrome://resources/cr_elements/cr_button/cr_button.html">
<link rel="import" href="chrome://resources/cr_elements/cr_input/cr_input.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">

<link rel="import" href="/components/common_styles.html">
-<link rel="import" href="/components/hd_iron_icon.html">
<link rel="import" href="/components/oobe_adaptive_dialog.html">
<link rel="import" href="/components/oobe_loading_dialog.html">
<link rel="import" href="/components/oobe_i18n_behavior.html">
@@ -43,8 +43,7 @@
}
</style>
<oobe-adaptive-dialog role="dialog" for-step="password">
- <hd-iron-icon icon1x="oobe-32:lock" icon2x="oobe-64:lock" slot="icon">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:lock"></iron-icon>
<h1 id="title" slot="title">[[email]]</h1>
<p id="subtitle" slot="subtitle">
[[subtitleText_(locale, isManualInput)]]
diff --git a/chrome/browser/resources/chromeos/login/screen_error_message.html b/chrome/browser/resources/chromeos/login/screen_error_message.html
index c9e6107..69d3708 100644
--- a/chrome/browser/resources/chromeos/login/screen_error_message.html
+++ b/chrome/browser/resources/chromeos/login/screen_error_message.html
@@ -1,8 +1,11 @@
-<link rel="import" href="chrome://oobe/custom_elements.html">
+<link rel="import" href="chrome://resources/html/polymer.html">
+
<link rel="import" href="chrome://resources/html/action_link.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://oobe/custom_elements.html">
+
<link rel="import" href="/components/oobe_adaptive_dialog.html">
<link rel="import" href="/components/oobe_i18n_behavior.html">
<link rel="import" href="/components/login_screen_behavior.html">
@@ -47,10 +50,8 @@
}
</style>
<oobe-adaptive-dialog role="dialog" id="dialog">
- <hd-iron-icon slot="icon"
- icon1x="oobe-network-32:dialog-icon-wifi"
- icon2x="oobe-network-64:dialog-icon-wifi">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:wifi">
+ </iron-icon>
<h1 slot="title" aria-live="assertive">
[[getDialogTitle_(locale, errorState_, uiState_)]]
</h1>
diff --git a/chrome/browser/resources/chromeos/login/screen_gaia_signin.html b/chrome/browser/resources/chromeos/login/screen_gaia_signin.html
index 24448e0..dc1c7c1e 100644
--- a/chrome/browser/resources/chromeos/login/screen_gaia_signin.html
+++ b/chrome/browser/resources/chromeos/login/screen_gaia_signin.html
@@ -2,11 +2,13 @@
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->

+<link rel="import" href="chrome://resources/html/polymer.html">
+
<link rel="import" href="chrome://resources/cr_elements/icons.html">
<link rel="import" href="chrome://resources/html/action_link.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">

<link rel="import" href="/components/common_styles.html">
-<link rel="import" href="/components/hd_iron_icon.html">
<link rel="import" href="/components/oobe_i18n_behavior.html">
<link rel="import" href="/components/oobe_loading_dialog.html">
<link rel="import" href="/components/oobe_adaptive_dialog.html">
@@ -60,9 +62,7 @@
</security-token-pin>
<oobe-adaptive-dialog id="saml-interstitial" role="dialog" has-buttons
for-step="saml-interstitial">
- <hd-iron-icon slot="icon" icon1x="oobe-32:googleg"
- icon2x="oobe-64:googleg">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:googleg"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'loginWelcomeMessage')]]
</h1>
diff --git a/chrome/browser/resources/chromeos/login/screen_signin_fatal_error.html b/chrome/browser/resources/chromeos/login/screen_signin_fatal_error.html
index 2196160..14da623 100644
--- a/chrome/browser/resources/chromeos/login/screen_signin_fatal_error.html
+++ b/chrome/browser/resources/chromeos/login/screen_signin_fatal_error.html
@@ -2,8 +2,11 @@
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->

+<link rel="import" href="chrome://resources/html/polymer.html">
+
+<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
+
<link rel="import" href="/components/common_styles.html">
-<link rel="import" href="/components/hd_iron_icon.html">
<link rel="import" href="/components/oobe_adaptive_dialog.html">
<link rel="import" href="/components/oobe_i18n_behavior.html">
<link rel="import" href="/components/oobe_dialog_host_behavior.html">
@@ -14,9 +17,7 @@
<style include="oobe-dialog-host">
</style>
<oobe-adaptive-dialog id="signinFatalErrorDialog" role="dialog">
- <hd-iron-icon slot="icon"
- icon1x="oobe-32:alert" icon2x="oobe-64:alert">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:alert"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'errorGenericFatalErrorTitle')]]
</h1>
diff --git a/chrome/browser/resources/chromeos/login/screen_tpm_error.html b/chrome/browser/resources/chromeos/login/screen_tpm_error.html
index 66d6295..dc52b37 100644
--- a/chrome/browser/resources/chromeos/login/screen_tpm_error.html
+++ b/chrome/browser/resources/chromeos/login/screen_tpm_error.html
@@ -1,11 +1,15 @@
<!-- 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. -->
-<link rel="import" href="chrome://oobe/custom_elements.html">
+
+<link rel="import" href="chrome://resources/html/polymer.html">
+
<link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
+
+<link rel="import" href="chrome://oobe/custom_elements.html">

<link rel="import" href="/components/common_styles.html">
-<link rel="import" href="/components/hd_iron_icon.html">
<link rel="import" href="/components/oobe_adaptive_dialog.html">
<link rel="import" href="/components/oobe_i18n_behavior.html">
<link rel="import" href="/components/oobe_dialog_host_behavior.html">
@@ -16,9 +20,7 @@
<style include="oobe-dialog-host"></style>
<oobe-adaptive-dialog id="errorDialog" role="dialog"
aria-label$="[[i18nDynamic(locale, 'errorTpmFailureTitle')]]">
- <hd-iron-icon slot="icon" icon1x="oobe-32:warning"
- icon2x="oobe-64:warning">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:warning"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'errorTpmFailureTitle')]]
</h1>
diff --git a/chrome/browser/resources/chromeos/login/screen_wrong_hwid.html b/chrome/browser/resources/chromeos/login/screen_wrong_hwid.html
index c8dc191..f4c8c1b 100644
--- a/chrome/browser/resources/chromeos/login/screen_wrong_hwid.html
+++ b/chrome/browser/resources/chromeos/login/screen_wrong_hwid.html
@@ -2,8 +2,11 @@
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->

+<link rel="import" href="chrome://resources/html/polymer.html">
+
+<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
+
<link rel="import" href="/components/common_styles.html">
-<link rel="import" href="/components/hd_iron_icon.html">
<link rel="import" href="/components/oobe_adaptive_dialog.html">
<link rel="import" href="/components/oobe_i18n_behavior.html">
<link rel="import" href="/components/oobe_dialog_host_behavior.html">
@@ -13,9 +16,7 @@
<template>
<style include="oobe-dialog-host"></style>
<oobe-adaptive-dialog role="dialog">
- <hd-iron-icon slot="icon" class="warning"
- icon1x="oobe-32:warning" icon2x="oobe-64:warning">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:warning"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'wrongHWIDScreenHeader')]]
</h1>
diff --git a/chrome/browser/resources/chromeos/login/screens/login/active_directory_password_change.html b/chrome/browser/resources/chromeos/login/screens/login/active_directory_password_change.html
index cf55b4a..eabda14 100644
--- a/chrome/browser/resources/chromeos/login/screens/login/active_directory_password_change.html
+++ b/chrome/browser/resources/chromeos/login/screens/login/active_directory_password_change.html
@@ -6,9 +6,9 @@

<link rel="import" href="chrome://resources/cr_elements/shared_style_css.html">
<link rel="import" href="chrome://resources/cr_elements/cr_input/cr_input.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">

<link rel="import" href="/components/common_styles.html">
-<link rel="import" href="/components/hd_iron_icon.html">
<link rel="import" href="/components/oobe_adaptive_dialog.html">
<link rel="import" href="/components/oobe_dialog_host_behavior.html">
<link rel="import" href="/components/oobe_loading_dialog.html">
@@ -35,8 +35,7 @@
</style>
<oobe-adaptive-dialog id="passwordChangeDialog" role="dialog"
for-step="password">
- <hd-iron-icon slot="icon" icon1x="oobe-32:avatar" icon2x="oobe-64:avatar">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:avatar"></iron-icon>
<h1 slot="title" id="title">
[[i18nDynamic(locale, 'adPassChangeMessage', username)]]
</h1>
diff --git a/chrome/browser/resources/chromeos/login/screens/login/encryption_migration.html b/chrome/browser/resources/chromeos/login/screens/login/encryption_migration.html
index 5639a7e..bb2d7f6 100644
--- a/chrome/browser/resources/chromeos/login/screens/login/encryption_migration.html
+++ b/chrome/browser/resources/chromeos/login/screens/login/encryption_migration.html
@@ -2,11 +2,13 @@
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->

+<link rel="import" href="chrome://resources/html/polymer.html">
+
+<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-progress/paper-progress.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html">
<link rel="import" href="chrome://oobe/custom_elements.html">

-<link rel="import" href="/components/hd_iron_icon.html">
<link rel="import" href="/components/oobe_adaptive_dialog.html">
<link rel="import" href="/components/oobe_dialog_host_behavior.html">
<link rel="import" href="/components/oobe_i18n_behavior.html">
@@ -45,9 +47,7 @@
<oobe-adaptive-dialog for-step="initial"></oobe-adaptive-dialog>
<oobe-adaptive-dialog id="ready-dialog" role="dialog" for-step="ready"
aria-label$="[[i18nDynamic(locale, 'migrationReadyTitle')]]">
- <hd-iron-icon slot="icon"
- icon1x="oobe-32:warning" icon2x="oobe-64:warning">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:warning"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'migrationReadyTitle')]]
</h1>
@@ -89,9 +89,7 @@
<oobe-adaptive-dialog id="migrating-dialog" role="dialog"
for-step="migrating"
aria-label$="[[i18nDynamic(locale, 'migrationMigratingTitle')]]">
- <hd-iron-icon slot="icon"
- icon1x="oobe-32:googleg" icon2x="oobe-64:googleg">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:googleg"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'migrationMigratingTitle')]]
</h1>
@@ -113,9 +111,7 @@
<oobe-adaptive-dialog id="error-dialog" role="dialog"
for-step="migration-failed"
aria-label$="[[i18nDynamic(locale, 'migrationFailedTitle')]]">
- <hd-iron-icon slot="icon"
- icon1x="oobe-32:warning" icon2x="oobe-64:warning">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:warning"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'migrationFailedTitle')]]
</h1>
@@ -138,9 +134,7 @@
<oobe-adaptive-dialog id="insufficient-space-dialog" role="dialog"
for-step="not-enough-space"
aria-label$="[[i18nDynamic(locale, 'migrationReadyTitle')]]">
- <hd-iron-icon slot="icon"
- icon1x="oobe-32:warning" icon2x="oobe-64:warning">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:warning"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'migrationReadyTitle')]]
</h1>
diff --git a/chrome/browser/resources/chromeos/login/screens/login/gaia_password_changed.html b/chrome/browser/resources/chromeos/login/screens/login/gaia_password_changed.html
index 058b8c6..aa08c4a 100644
--- a/chrome/browser/resources/chromeos/login/screens/login/gaia_password_changed.html
+++ b/chrome/browser/resources/chromeos/login/screens/login/gaia_password_changed.html
@@ -5,9 +5,9 @@
<link rel="import" href="chrome://resources/html/polymer.html">

<link rel="import" href="chrome://resources/cr_elements/cr_input/cr_input.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">

<link rel="import" href="/components/common_styles.html">
-<link rel="import" href="/components/hd_iron_icon.html">
<link rel="import" href="/components/oobe_adaptive_dialog.html">
<link rel="import" href="/components/oobe_i18n_behavior.html">
<link rel="import" href="/components/oobe_loading_dialog.html">
@@ -33,8 +33,7 @@
<template>
<style include="oobe-dialog-host"></style>
<oobe-adaptive-dialog role="dialog" for-step="password" id="passwordStep">
- <hd-iron-icon icon1x="oobe-32:avatar" icon2x="oobe-64:avatar" slot="icon">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:avatar"></iron-icon>
<h1 slot="title">[[email]]</h1>
<p slot="subtitle">
[[i18nDynamic(locale, 'passwordChangedTitle')]]
@@ -62,9 +61,7 @@
</oobe-adaptive-dialog>

<oobe-adaptive-dialog role="dialog" for-step="forgot" id="forgotPassword">
- <hd-iron-icon icon1x="oobe-32:warning" icon2x="oobe-64:warning"
- slot="icon">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:warning"></iron-icon>
<h1 slot="title">[[email]]</h1>
<p slot="subtitle">
[[i18nDynamic(locale, 'passwordChangedProceedAnywayTitle')]]
diff --git a/chrome/browser/resources/chromeos/login/screens/login/public_session_terms_of_service.html b/chrome/browser/resources/chromeos/login/screens/login/public_session_terms_of_service.html
index 0eb4e7d4..ca459ea 100644
--- a/chrome/browser/resources/chromeos/login/screens/login/public_session_terms_of_service.html
+++ b/chrome/browser/resources/chromeos/login/screens/login/public_session_terms_of_service.html
@@ -2,12 +2,14 @@
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->

+<link rel="import" href="chrome://resources/html/polymer.html">
+
<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://oobe/custom_elements.html">

<link rel="import" href="/components/common_styles.html">
-<link rel="import" href="/components/hd_iron_icon.html">
<link rel="import" href="/components/oobe_adaptive_dialog.html">
<link rel="import" href="/components/oobe_i18n_behavior.html">
<link rel="import" href="/components/oobe_loading_dialog.html">
@@ -25,9 +27,7 @@
<oobe-adaptive-dialog id="termsOfServiceErrorDialog" role="dialog"
aria-label$="[[i18nDynamic(locale, 'termsOfServiceError')]]"
for-step="error">
- <hd-iron-icon slot="icon" icon1x="oobe-32:warning"
- icon2x="oobe-64:warning">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:warning"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'termsOfServiceError')]]
</h1>
@@ -57,9 +57,7 @@
dialog is marked as no-lazy. -->
<oobe-adaptive-dialog id="termsOfServiceDialog" role="dialog"
aria-labelledby="title" for-step="loaded" no-lazy>
- <hd-iron-icon slot="icon" id="termsOfServiceGoogleIcon"
- icon1x="oobe-32:googleg" icon2x="oobe-64:googleg">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:googleg"></iron-icon>

<h1 id="tosHeading" slot="title">[[i18nDynamic(locale,
'termsOfServiceScreenHeading', tosManager_)]]</h1>
diff --git a/chrome/browser/resources/chromeos/login/screens/login/update_required_card.html b/chrome/browser/resources/chromeos/login/screens/login/update_required_card.html
index 5ec9325..e5294a64 100644
--- a/chrome/browser/resources/chromeos/login/screens/login/update_required_card.html
+++ b/chrome/browser/resources/chromeos/login/screens/login/update_required_card.html
@@ -4,8 +4,9 @@

<link rel="import" href="chrome://resources/html/polymer.html">

+<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
+
<link rel="import" href="/components/common_styles.html">
-<link rel="import" href="/components/hd_iron_icon.html">
<link rel="import" href="/components/oobe_adaptive_dialog.html">
<link rel="import" href="/components/oobe_i18n_behavior.html">
<link rel="import" href="/components/oobe_dialog_host_behavior.html">
@@ -46,9 +47,7 @@
<oobe-adaptive-dialog for-step="update-required-message" role="dialog"
id="update-required-dialog"
aria-label$="[[i18nDynamic(locale, 'updateRequiredTitle')]]">
- <hd-iron-icon slot="icon"
- icon1x="oobe-32:enterprise" icon2x="oobe-64:enterprise">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:enterprise"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'updateRequiredTitle')]]
</h1>
@@ -70,9 +69,7 @@
<oobe-adaptive-dialog for-step="update-error"
id="update-required-error-dialog" role="dialog"
aria-label$="[[i18nDynamic(locale, 'updateRequiredTitle')]]">
- <hd-iron-icon slot="icon"
- icon1x="oobe-32:enterprise" icon2x="oobe-64:enterprise">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:enterprise"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'updateRequiredTitle')]]
</h1>
@@ -105,9 +102,7 @@
<oobe-adaptive-dialog for-step="update-need-permission" role="dialog"
id="update-need-permission-dialog"
aria-label$="[[i18nDynamic(locale, 'updateRequiredTitle')]]">
- <hd-iron-icon slot="icon"
- icon1x="oobe-32:enterprise" icon2x="oobe-64:enterprise">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:enterprise"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'updateRequiredTitle')]]
</h1>
@@ -130,9 +125,7 @@
<oobe-adaptive-dialog for-step="update-no-network" role="dialog"
id="update-required-no-network-dialog"
aria-label$="[[i18nDynamic(locale, 'updateRequiredTitle')]]">
- <hd-iron-icon slot="icon"
- icon1x="oobe-32:enterprise" icon2x="oobe-64:enterprise">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:enterprise"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'updateRequiredTitle')]]
</h1>
@@ -154,9 +147,7 @@

<oobe-adaptive-dialog for-step="eol" id="eolDialog"
role="dialog" aria-labelledby="eolTitle">
- <hd-iron-icon slot="icon" id="eolAlertIcon"
- icon1x="oobe-32:warning" icon2x="oobe-64:warning">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:warning"></iron-icon>
<h1 id="eolTitle" slot="title">
[[i18nDynamic(locale, 'eolTitle', deviceName)]]
</h1>
diff --git a/chrome/browser/resources/chromeos/login/screens/oobe/demo_preferences.html b/chrome/browser/resources/chromeos/login/screens/oobe/demo_preferences.html
index b3fc529..e0571cd 100644
--- a/chrome/browser/resources/chromeos/login/screens/oobe/demo_preferences.html
+++ b/chrome/browser/resources/chromeos/login/screens/oobe/demo_preferences.html
@@ -1,9 +1,10 @@
+<link rel="import" href="chrome://resources/html/polymer.html">
+
<link rel="import" href="chrome://resources/html/i18n_behavior.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">

<link rel="import" href="/components/common_styles.html">
-<link rel="import" href="/components/hd_iron_icon.html">
<link rel="import" href="/components/oobe_adaptive_dialog.html">
<link rel="import" href="/components/oobe_i18n_behavior.html">
<link rel="import" href="/components/oobe_dialog_host_behavior.html">
@@ -30,9 +31,7 @@
</style>
<oobe-adaptive-dialog id="demoPreferencesDialog" role="dialog"
aria-label$="[[i18nDynamic(locale, 'demoPreferencesScreenTitle')]]">
- <hd-iron-icon slot="icon"
- icon1x="oobe-32:gear" icon2x="oobe-64:gear">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:gear"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'demoPreferencesScreenTitle')]]
</h1>
diff --git a/chrome/browser/resources/chromeos/login/screens/oobe/demo_setup.html b/chrome/browser/resources/chromeos/login/screens/oobe/demo_setup.html
index 97b258c..9aa4ece 100644
--- a/chrome/browser/resources/chromeos/login/screens/oobe/demo_setup.html
+++ b/chrome/browser/resources/chromeos/login/screens/oobe/demo_setup.html
@@ -1,5 +1,8 @@
+<link rel="import" href="chrome://resources/html/polymer.html">
+
+<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
+
<link rel="import" href="/components/common_styles.html">
-<link rel="import" href="/components/hd_iron_icon.html">
<link rel="import" href="/components/oobe_adaptive_dialog.html">
<link rel="import" href="/components/oobe_i18n_behavior.html">
<link rel="import" href="/components/progress_list_item.html">
@@ -13,9 +16,7 @@
<oobe-adaptive-dialog id="demoSetupProgressDialog" role="dialog"
aria-label$="[[i18nDynamic(locale, 'demoSetupProgressScreenTitle')]]"
for-step="progress">
- <hd-iron-icon slot="icon"
- icon1x="oobe-32:computer" icon2x="oobe-64:computer">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:computer"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'demoSetupProgressScreenTitle')]]
</h1>
@@ -42,9 +43,7 @@
<oobe-adaptive-dialog id="demoSetupErrorDialog" role="dialog"
aria-label$="[[i18nDynamic(locale, 'demoSetupErrorScreenTitle')]]"
for-step="error">
- <hd-iron-icon slot="icon"
- icon1x="oobe-32:warning" icon2x="oobe-64:warning">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:warning"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'demoSetupErrorScreenTitle')]]
</h1>
diff --git a/chrome/browser/resources/chromeos/login/screens/oobe/enable_debugging.html b/chrome/browser/resources/chromeos/login/screens/oobe/enable_debugging.html
index 36e3d0c..c976589 100644
--- a/chrome/browser/resources/chromeos/login/screens/oobe/enable_debugging.html
+++ b/chrome/browser/resources/chromeos/login/screens/oobe/enable_debugging.html
@@ -2,10 +2,12 @@
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->

+<link rel="import" href="chrome://resources/html/polymer.html">
+
<link rel="import" href="chrome://resources/cr_elements/action_link_css.html">
<link rel="import" href="chrome://resources/html/action_link.html">
<link rel="import" href="chrome://resources/html/i18n_behavior.html">
-<link rel="import" href="chrome://resources/html/polymer.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">

<link rel="import" href="/components/common_styles.html">
<link rel="import" href="/components/oobe_adaptive_dialog.html">
@@ -26,8 +28,7 @@
for-step="remove-protection"
aria-label$="[[i18nDynamic(locale,
'enableDebuggingScreenAccessibleTitle')]]">
- <hd-iron-icon slot="icon" icon1x="oobe-32:alert" icon2x="oobe-64:alert">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:alert"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'enableDebuggingScreenTitle')]]
</h1>
@@ -52,8 +53,7 @@
<oobe-adaptive-dialog id="setupDialog" for-step="setup" role="dialog"
aria-label$="[[i18nDynamic(locale,
'enableDebuggingScreenAccessibleTitle')]]">
- <hd-iron-icon slot="icon" icon1x="oobe-32:alert" icon2x="oobe-64:alert">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:alert"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'enableDebuggingScreenTitle')]]
</h1>
@@ -96,8 +96,7 @@
<oobe-adaptive-dialog id="doneDialog" role="dialog" for-step="done"
aria-label$="[[i18nDynamic(locale,
'enableDebuggingScreenAccessibleTitle')]]">
- <hd-iron-icon slot="icon" icon1x="oobe-32:alert" icon2x="oobe-64:alert">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:alert"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'enableDebuggingScreenTitle')]]
</h1>
@@ -118,8 +117,7 @@
<oobe-adaptive-dialog id="errorDialog" role="dialog" for-step="error"
aria-label$="[[i18nDynamic(locale,
'enableDebuggingScreenAccessibleTitle')]]">
- <hd-iron-icon slot="icon" icon1x="oobe-32:warning"
- icon2x="oobe-64:warning"></hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:warning"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'enableDebuggingErrorTitle')]]
</h1>
diff --git a/chrome/browser/resources/chromeos/login/screens/oobe/hid_detection.html b/chrome/browser/resources/chromeos/login/screens/oobe/hid_detection.html
index 24c1671..db72686 100644
--- a/chrome/browser/resources/chromeos/login/screens/oobe/hid_detection.html
+++ b/chrome/browser/resources/chromeos/login/screens/oobe/hid_detection.html
@@ -1,9 +1,10 @@
+<link rel="import" href="chrome://resources/html/polymer.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/polymer/v1_0/paper-styles/color.html">

<link rel="import" href="/components/common_styles.html">
-<link rel="import" href="/components/hd_iron_icon.html">
<link rel="import" href="/components/oobe_i18n_behavior.html">
<link rel="import" href="/components/oobe_adaptive_dialog.html">
<link rel="import" href="/components/oobe_dialog_host_behavior.html">
@@ -31,16 +32,6 @@
</svg>
</iron-iconset-svg>

-<iron-iconset-svg name="oobe-hid-detection-32" size="32">
- <svg>
- <defs>
- <g id="connect-devices">
- <path fill="#fff" d="M0 0h32v32H0z"></path><path fill-rule="evenodd" clip-rule="evenodd" d="M3 0h24c1.65 0 3 1.35 3 3v7.418a9.898 9.898 0 00-3-1.313V3H3v15h12.016v3H3c-1.65 0-3-1.35-3-3L.015 3C.015 1.35 1.35 0 3 0zm12.902 13.5a7.384 7.384 0 00-.87 3H9v-3h6.902zM21 9.332a9.636 9.636 0 00-3 1.648V9h3v.332zM13.5 4.5h3v3h-3v-3zm3 4.5h-3v3h3V9zM9 4.5h3v3H9v-3zM12 9H9v3h3V9zM4.5 9h3v3h-3V9zm3-4.5h-3v3h3v-3zm10.5 0h3v3h-3v-3zm4.5 0h3v3h-3v-3z" fill="#1A73E8"></path><path fill-rule="evenodd" clip-rule="evenodd" d="M24.5 11c-4.146 0-7.5 3.13-7.5 7v6c0 3.87 3.354 7 7.5 7s7.5-3.13 7.5-7v-6c0-3.87-3.354-7-7.5-7zm5 6.875v.625h-3.75v-5c2.5 0 3.75 2.5 3.75 4.375zM23.25 13.5v5H19.5V18c0-2 1.25-4.5 3.75-4.5zm1.25 15c-2.957 0-5-1.74-5-4.5v-3h10v3c0 2.76-2.043 4.5-5 4.5z" fill="#1A73E8"></path>
- </g>
- </defs>
- </svg>
-</iron-iconset-svg>
-
<iron-iconset-svg name="oobe-hid-detection-40" size="40">
<svg>
<defs>
@@ -63,17 +54,6 @@
</svg>
</iron-iconset-svg>

-<iron-iconset-svg name="oobe-hid-detection-64" size="64">
- <svg>
- <defs>
- <g id="connect-devices">
- <g clip-path="url(#clip0)">
- <path fill="#fff" d="M.5 0h64v64H.5z"></path><path fill-rule="evenodd" clip-rule="evenodd" d="M6.5 0h48c3.3 0 6 2.7 6 6v14.837a19.795 19.795 0 00-6-2.626V6h-48v30h24.031v6H6.5c-3.3 0-6-2.7-6-6L.53 6c0-3.3 2.67-6 5.97-6zm25.803 27a14.77 14.77 0 00-1.738 6H18.5v-6h13.803zM42.5 18.664a19.271 19.271 0 00-6 3.296V18h6v.664zM27.5 9h6v6h-6V9zm6 9h-6v6h6v-6zm-15-9h6v6h-6V9zm6 9h-6v6h6v-6zm-15 0h6v6h-6v-6zm6-9h-6v6h6V9zm21 0h6v6h-6V9zm9 0h6v6h-6V9z" fill="#1A73E8"></path><path fill-rule="evenodd" clip-rule="evenodd" d="M49.5 22c-8.293 0-15 6.26-15 14v12c0 7.74 6.707 14 15 14s15-6.26 15-14V36c0-7.74-6.707-14-15-14zm10 13.75V37H52V27c5 0 7.5 5 7.5 8.75zM47 27v10h-7.5v-1c0-4 2.5-9 7.5-9zm2.5 30c-5.914 0-10-3.48-10-9v-6h20v6c0 5.52-4.086 9-10 9z" fill="#1A73E8"></path></g><defs><clipPath id="clip0"><path fill="#fff" transform="translate(.5)" d="M0 0h64v64H0z"></path></clipPath></defs>
- </g>
- </defs>
- </svg>
-</iron-iconset-svg>
-
<dom-module id="hid-detection-element">
<template>
<style include="oobe-dialog-host">
@@ -123,10 +103,8 @@
}
</style>
<oobe-adaptive-dialog>
- <hd-iron-icon slot="icon"
- icon1x="oobe-hid-detection-32:connect-devices"
- icon2x="oobe-hid-detection-64:connect-devices">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:connect-devices">
+ </iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'hidDetectionInvitation')]]
</h1>
@@ -138,10 +116,9 @@
class="layout vertical justified hid-selection-entry"
hidden="[[!touchscreenDetected_]]">
<div id="hid-touchscreen-row" class="flex layout horizontal center">
- <hd-iron-icon id="touchscreen-icon" alt=""
- icon1x="oobe-hid-detection-20:touchscreen"
- icon2x="oobe-hid-detection-40:touchscreen">
- </hd-iron-icon>
+ <iron-icon id="touchscreen-icon" alt=""
+ icon="oobe-hid-detection-20:touchscreen">
+ </iron-icon>
<img id="touchscreen-tick" alt=""
src="chrome://theme/IDR_BLUETOOTH_PAIRING_TICK">
<div id="touchscreen-label" aria-live="polite">
@@ -151,10 +128,9 @@
</div>
<div class="layout vertical hid-selection-entry">
<div id="hid-mouse-row" class="flex layout horizontal center">
- <hd-iron-icon id="mouse-icon" alt=""
- icon1x="oobe-hid-detection-20:mouse"
- icon2x="oobe-hid-detection-40:mouse">
- </hd-iron-icon>
+ <iron-icon id="mouse-icon" alt=""
+ icon="oobe-hid-detection-20:mouse">
+ </iron-icon>
<img id="mouse-tick" alt=""
hidden="[[!tickIsVisible_(mouseState_)]]"
src="chrome://theme/IDR_BLUETOOTH_PAIRING_TICK">
@@ -169,10 +145,9 @@
<div class="layout vertical hid-selection-entry">
<div id="hid-keyboard-row" class="flex layout horizontal center"
on-click="openPinDialog_">
- <hd-iron-icon id="keyboard-icon" alt=""
- icon1x="oobe-hid-detection-20:keyboard"
- icon2x="oobe-hid-detection-40:keyboard">
- </hd-iron-icon>
+ <iron-icon id="keyboard-icon" alt=""
+ icon="oobe-hid-detection-20:keyboard">
+ </iron-icon>
<img id="keyboard-tick" alt=""
hidden="[[!tickIsVisible_(keyboardState_)]]"
src="chrome://theme/IDR_BLUETOOTH_PAIRING_TICK">
diff --git a/chrome/browser/resources/chromeos/login/screens/oobe/oobe_eula.html b/chrome/browser/resources/chromeos/login/screens/oobe/oobe_eula.html
index c683cacf..2cc3dc87 100644
--- a/chrome/browser/resources/chromeos/login/screens/oobe/oobe_eula.html
+++ b/chrome/browser/resources/chromeos/login/screens/oobe/oobe_eula.html
@@ -2,6 +2,8 @@
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->

+<link rel="import" href="chrome://resources/html/polymer.html">
+
<link rel="import" href="chrome://resources/cr_elements/shared_style_css.html">
<link rel="import" href="chrome://resources/cr_elements/cr_checkbox/cr_checkbox.html">
<link rel="import" href="chrome://resources/html/action_link.html">
@@ -9,7 +11,6 @@
<link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html">

<link rel="import" href="/components/common_styles.html">
-<link rel="import" href="/components/hd_iron_icon.html">
<link rel="import" href="/components/oobe_adaptive_dialog.html">
<link rel="import" href="/components/oobe_i18n_behavior.html">
<link rel="import" href="/components/login_screen_behavior.html">
@@ -83,9 +84,7 @@
<oobe-adaptive-dialog id="eulaLoadingDialog" for-step="loading"
role="dialog"
aria-label$="[[i18nDynamic(locale, 'termsOfServiceLoading')]]">
- <hd-iron-icon slot="icon"
- icon1x="oobe-32:googleg" icon2x="oobe-64:googleg">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:googleg"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'termsOfServiceLoading')]]
</h1>
@@ -95,9 +94,7 @@
<oobe-adaptive-dialog id="eulaDialog" for-step="eula" role="dialog"
aria-label$="[[i18nDynamic(locale, 'oobeEulaSectionTitle')]]"
aria-describedby="crosEulaFrame" no-lazy>
- <hd-iron-icon slot="icon"
- icon1x="oobe-32:googleg" icon2x="oobe-64:googleg">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:googleg"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'oobeEulaSectionTitle')]]
</h1>
@@ -147,9 +144,7 @@
<oobe-adaptive-dialog id="securitySettingsDialog" role="dialog"
for-step="security"
aria-label$="[[i18nDynamic(locale, 'eulaSystemSecuritySettings')]]">
- <hd-iron-icon slot="icon"
- icon1x="oobe-32:googleg" icon2x="oobe-64:googleg">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:googleg"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'eulaSystemSecuritySettings')]]
</h1>
diff --git a/chrome/browser/resources/chromeos/login/screens/oobe/oobe_network.html b/chrome/browser/resources/chromeos/login/screens/oobe/oobe_network.html
index 33888f7..003924a 100644
--- a/chrome/browser/resources/chromeos/login/screens/oobe/oobe_network.html
+++ b/chrome/browser/resources/chromeos/login/screens/oobe/oobe_network.html
@@ -1,9 +1,10 @@
+<link rel="import" href="chrome://resources/html/polymer.html">
+
<link rel="import" href="chrome://resources/html/i18n_behavior.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">

<link rel="import" href="/components/common_styles.html">
-<link rel="import" href="/components/hd_iron_icon.html">
<link rel="import" href="/components/oobe_adaptive_dialog.html">
<link rel="import" href="/components/oobe_i18n_behavior.html">
<link rel="import" href="/components/oobe_dialog_host_behavior.html">
@@ -19,10 +20,8 @@
<oobe-adaptive-dialog id="networkDialog" role="dialog"
on-show-dialog="onShown_"
aria-label$="[[i18nDynamic(locale, 'networkSectionTitle')]]">
- <hd-iron-icon slot="icon"
- icon1x="oobe-network-32:dialog-icon-wifi"
- icon2x="oobe-network-64:dialog-icon-wifi">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:wifi">
+ </iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'networkSectionTitle')]]
</h1>
diff --git a/chrome/browser/resources/chromeos/login/screens/oobe/packaged_license.html b/chrome/browser/resources/chromeos/login/screens/oobe/packaged_license.html
index 58f3138..eb9a917c 100644
--- a/chrome/browser/resources/chromeos/login/screens/oobe/packaged_license.html
+++ b/chrome/browser/resources/chromeos/login/screens/oobe/packaged_license.html
@@ -2,12 +2,15 @@
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->

-<link rel="import" href="chrome://oobe/custom_elements.html">
+<link rel="import" href="chrome://resources/html/polymer.html">
+
<link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
<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://oobe/custom_elements.html">

<link rel="import" href="/components/common_styles.html">
-<link rel="import" href="/components/hd_iron_icon.html">
<link rel="import" href="/components/oobe_adaptive_dialog.html">
<link rel="import" href="/components/oobe_i18n_behavior.html">
<link rel="import" href="/components/oobe_dialog_host_behavior.html">
@@ -19,9 +22,7 @@
<oobe-adaptive-dialog id="packagedLicenseDialog"
aria-label$="[[i18nDynamic(locale, 'oobePackagedLicenseTitle')]]"
role="dialog">
- <hd-iron-icon slot="icon"
- icon1x="oobe-32:enterprise" icon2x="oobe-64:enterprise">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:enterprise"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'oobePackagedLicenseTitle')]]
</h1>
diff --git a/chrome/browser/resources/chromeos/login/security_token_pin.html b/chrome/browser/resources/chromeos/login/security_token_pin.html
index 0488aa3..519aca6 100644
--- a/chrome/browser/resources/chromeos/login/security_token_pin.html
+++ b/chrome/browser/resources/chromeos/login/security_token_pin.html
@@ -2,10 +2,12 @@
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->

+<link rel="import" href="chrome://resources/html/polymer.html">
+
+<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
<link rel="import" href="chrome://resources/cr_elements/icons.html">

<link rel="import" href="/components/common_styles.html">
-<link rel="import" href="/components/hd_iron_icon.html">
<link rel="import" href="/components/oobe_adaptive_dialog.html">
<link rel="import" href="/components/oobe_i18n_behavior.html">
<link rel="import" href="/components/oobe_dialog_host_behavior.html">
@@ -49,9 +51,7 @@
<oobe-adaptive-dialog class="gaia-dialog" role="dialog" id="dialog"
aria-describedby="description"
aria-label$="[[i18nDynamic(locale, 'securityTokenPinDialogTitle')]]">
- <hd-iron-icon slot="icon" icon1x="oobe-32:lock"
- icon2x="oobe-64:lock">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:lock"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'securityTokenPinDialogTitle')]]
</h1>
diff --git a/chrome/browser/resources/chromeos/login/sync_consent.html b/chrome/browser/resources/chromeos/login/sync_consent.html
index a06a046..4f044127 100644
--- a/chrome/browser/resources/chromeos/login/sync_consent.html
+++ b/chrome/browser/resources/chromeos/login/sync_consent.html
@@ -2,6 +2,8 @@
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->

+<link rel="import" href="chrome://resources/html/polymer.html">
+
<link rel="import" href="chrome://resources/cr_elements/cr_checkbox/cr_checkbox.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
<if expr="_google_chrome">
@@ -27,9 +29,7 @@
<oobe-adaptive-dialog id="syncConsentOverviewDialog" role="dialog"
aria-label$="[[i18nDynamic(locale, 'syncConsentScreenTitle')]]"
for-step="no-split">
- <hd-iron-icon slot="icon" icon1x="sync-consent-32:googleg"
- icon2x="sync-consent-64:googleg">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="sync-consent-32:googleg"></iron-icon>
<h1 slot="title" consent-description>
[[i18nDynamic(locale, 'syncConsentScreenTitle')]]
</h1>
@@ -48,9 +48,9 @@
</div>
</div>
<div class="overview-list-item flex layout horizontal center">
- <hd-iron-icon class="overview-list-item-icon" icon1x="sync-consent-32:googleg"
- icon2x="sync-consent-64:googleg">
- </hd-iron-icon>
+ <iron-icon icon="sync-consent-32:googleg"
+ class="overview-list-item-icon">
+ </iron-icon>
<div class="flex layout vertical center-justified">
<div role="heading" aria-level="2" class="overview-list-item-title" consent-description>
[[i18nDynamic(locale,
@@ -87,9 +87,7 @@
<oobe-adaptive-dialog id="splitSettingsSyncConsentDialog" role="dialog"
aria-label$="[[i18nDynamic(locale, 'syncConsentScreenTitle')]]"
for-step="split">
- <hd-iron-icon slot="icon" icon1x="sync-consent-32:googleg"
- icon2x="sync-consent-64:googleg">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:googleg"></iron-icon>
<h1 slot="title" consent-description>
[[i18nDynamic(locale, 'syncConsentScreenTitle')]]
</h1>
@@ -129,9 +127,9 @@

<!-- Personalize Google services -->
<div class="overview-list-item layout horizontal center">
- <hd-iron-icon class="overview-list-item-icon" icon1x="sync-consent-32:googleg"
- icon2x="sync-consent-64:googleg">
- </hd-iron-icon>
+ <iron-icon icon="sync-consent-32:googleg"
+ class="overview-list-item-icon">
+ </iron-icon>
<div class="flex layout vertical center-justified">
<div role="heading" aria-level="2" class="overview-list-item-title" consent-description>
[[i18nDynamic(locale,
diff --git a/chrome/browser/resources/chromeos/login/user_creation.html b/chrome/browser/resources/chromeos/login/user_creation.html
index d55e552..b70ad1b 100644
--- a/chrome/browser/resources/chromeos/login/user_creation.html
+++ b/chrome/browser/resources/chromeos/login/user_creation.html
@@ -2,10 +2,12 @@
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->

+<link rel="import" href="chrome://resources/html/polymer.html">
+
<link rel="import" href="chrome://resources/cr_elements/cr_radio_button/cr_card_radio_button.html">
<link rel="import" href="chrome://resources/cr_elements/cr_radio_group/cr_radio_group.html">
<link rel="import" href="chrome://resources/html/action_link.html">
-<link rel="import" href="chrome://resources/html/polymer.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">

<link rel="import" href="/components/common_styles.html">
<link rel="import" href="/components/hd_iron_icon.html">
@@ -148,9 +150,7 @@
</style>
<oobe-adaptive-dialog id="userCreationDialog" role="dialog"
aria-label$="[[i18nDynamic(locale, titleKey_)]]" for-step="create">
- <hd-iron-icon icon1x="oobe-32:googleg" icon2x="oobe-64:googleg"
- slot="icon">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:googleg"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, titleKey_)]]
</h1>
@@ -205,9 +205,7 @@
</oobe-adaptive-dialog>
<oobe-adaptive-dialog id="childSignInDialog" role="dialog" for-step="child"
aria-label$="[[i18nDynamic(locale, 'childSignInTitle')]]">
- <hd-iron-icon icon1x="oobe-32:family" icon2x="oobe-64:family"
- slot="icon">
- </hd-iron-icon>
+ <iron-icon slot="icon" icon="oobe-32:family"></iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'childSignInTitle')]]
</h1>
diff --git a/chrome/browser/resources/chromeos/password_change/lock_screen_reauth.html b/chrome/browser/resources/chromeos/password_change/lock_screen_reauth.html
index 4e6cc16..1265d15 100644
--- a/chrome/browser/resources/chromeos/password_change/lock_screen_reauth.html
+++ b/chrome/browser/resources/chromeos/password_change/lock_screen_reauth.html
@@ -186,7 +186,7 @@
aria-modal="true"
aria-label="$i18n{loginWelcomeMessageWithError}">
<div class="header">
- <iron-icon class="title-icon" icon="oobe-64:warning"></iron-icon>
+ <iron-icon class="title-icon" icon="oobe-32:warning"></iron-icon>
<div class="title">
$i18n{loginWelcomeMessageWithError}
</div>
@@ -223,7 +223,7 @@

<div class="content-wrapper" hidden="[[!isConfirmPassword_]]">
<div class="header">
- <iron-icon class="title-icon" icon="oobe-64:lock"></iron-icon>
+ <iron-icon class="title-icon" icon="oobe-32:lock"></iron-icon>
<div class="title">
[[email_]]
</div>
@@ -258,7 +258,7 @@

<div class="content-wrapper" hidden="[[!isPasswordChanged_]]">
<div class="header">
- <iron-icon class="title-icon" icon="oobe-64:lock"></iron-icon>
+ <iron-icon class="title-icon" icon="oobe-32:lock"></iron-icon>
<div class="title">
$i18n{passwordChangedTitle}
</div>
Reply all
Reply to author
Forward
Message has been deleted
0 new messages