Skip to content

GitLab

T
tangled
Commit 5e7b1029 authored by Scott Chen's avatar Scott Chen Committed by Commit Bot
Browse files
Options

WebUI: remove iron-icons/ dependency from inline_login. 

Bug: 855205
Change-Id: I96f9face7f052db192a8eb22077d5b1dd12da7ab
Reviewed-on: https://chromium-review.googlesource.com/1144413
Commit-Queue: Scott Chen <scottchen@chromium.org>
Reviewed-by: default avatarDemetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#577041}
parent 9dba103c
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 20 deletions
chrome/browser/resources/inline_login/inline_login.html
View file @ 5e7b1029
......@@ -3,10 +3,10 @@
<head>
<title>$i18n{title}</title>
<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/polymer/v1_0/paper-icon-button/paper-icon-button.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/iron-icons.html">
<link rel="stylesheet" href="chrome://resources/css/text_defaults.css">
<link rel="stylesheet" href="chrome://resources/css/spinner.css">
<link rel="stylesheet" href="chrome://resources/css/text_defaults.css">
<link rel="stylesheet" href="chrome://chrome-signin/inline_login.css">
<script src="chrome://resources/js/cr.js"></script>
<script src="chrome://resources/js/cr/event_target.js"></script>
......@@ -24,7 +24,7 @@
</div>
</div>
<paper-icon-button id="navigation-button"
icon="icons:close"></paper-icon-button>
icon="cr:close"></paper-icon-button>
<script src="chrome://resources/js/i18n_template.js"></script>
</body>
</html>
chrome/browser/resources/inline_login/inline_login.js
View file @ 5e7b1029
......@@ -117,7 +117,7 @@ cr.define('inline.login', function() {
function showBackButton() {
$('navigation-button').icon =
isRTL() ? 'icons:arrow-forward' : 'icons:arrow-back';
isRTL() ? 'cr:arrow-forward' : 'cr:arrow-back';
$('navigation-button')
.setAttribute(
......@@ -125,7 +125,7 @@ cr.define('inline.login', function() {
}
function showCloseButton() {
$('navigation-button').icon = 'icons:close';
$('navigation-button').icon = 'cr:close';
$('navigation-button').classList.add('enabled');
$('navigation-button')
.setAttribute(
......
chrome/browser/resources/media_router/elements/media_router_header/media_router_header.html
View file @ 5e7b1029
<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/i18n_behavior.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button.html">
<link rel="import" href="../../icons/media_router_icons.html">
......@@ -27,7 +29,7 @@
</div>
</div>
<div id="close-button-container">
<paper-icon-button icon="media-router:close" id="close-button"
<paper-icon-button icon="cr:close" id="close-button"
on-tap="onCloseButtonClick_" title="[[i18n('closeButtonTitle')]]">
</paper-icon-button>
</div>
......
chrome/browser/resources/media_router/elements/media_router_header/media_router_header.js
View file @ 5e7b1029
......@@ -99,8 +99,7 @@ Polymer({
attached: function() {
// isRTL() only works after i18n_template.js runs to set <html dir>.
// Set the back button icon based on text direction.
this.arrowDropIcon_ =
isRTL() ? 'media-router:arrow-forward' : 'media-router:arrow-back';
this.arrowDropIcon_ = isRTL() ? 'cr:arrow-forward' : 'cr:arrow-back';
},
/**
......@@ -110,8 +109,8 @@ Polymer({
*/
computeArrowDropIcon_: function(view) {
return view == media_router.MediaRouterView.CAST_MODE_LIST ?
'media-router:arrow-drop-up' :
'media-router:arrow-drop-down';
'cr:arrow-drop-up' :
'cr:arrow-drop-down';
},
/**
......
chrome/browser/resources/media_router/icons/media_router_icons.html
View file @ 5e7b1029
......@@ -5,11 +5,6 @@
<iron-iconset-svg name="media-router" size="24">
<svg><defs>
<!-- third_party/polymer/v1_0/components-chromium/iron-icons/iron-icons.html -->
<g id="arrow-back"><path d="M20 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H20v-2z"></path></g>
<g id="arrow-drop-down"><path d="M7 10l5 5 5-5z"></path></g>
<g id="arrow-drop-up"><path d="M7 14l5-5 5 5z"></path></g>
<g id="arrow-forward"><path d="M12 4l-1.41 1.41L16.17 11H4v2h12.17l-5.58 5.59L12 20l8-8z"></path></g>
<g id="close"><path d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"></path></g>
<g id="folder"><path d="M0 0h24v24H0z" fill="none"></path><path d="M20 6h-8l-2-2H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V8c0-1.1-.9-2-2-2zm0 12H4V8h16v10z"></path></g>
<g id="search"><path d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"></path></g>
<g id="tab"><path d="M21 3H3c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h18c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0 16H3V5h10v4h8v10z"></path></g>
......
chrome/test/data/webui/media_router/media_router_header_tests.js
View file @ 5e7b1029
......@@ -192,21 +192,21 @@ cr.define('media_router_header', function() {
// Tests the |computeArrowDropIcon_| function.
test('compute arrow drop icon', function() {
assertEquals(
'media-router:arrow-drop-up',
'cr:arrow-drop-up',
header.computeArrowDropIcon_(
media_router.MediaRouterView.CAST_MODE_LIST));
assertEquals(
'media-router:arrow-drop-down',
'cr:arrow-drop-down',
header.computeArrowDropIcon_(media_router.MediaRouterView.FILTER));
assertEquals(
'media-router:arrow-drop-down',
'cr:arrow-drop-down',
header.computeArrowDropIcon_(media_router.MediaRouterView.ISSUE));
assertEquals(
'media-router:arrow-drop-down',
'cr:arrow-drop-down',
header.computeArrowDropIcon_(
media_router.MediaRouterView.ROUTE_DETAILS));
assertEquals(
'media-router:arrow-drop-down',
'cr:arrow-drop-down',
header.computeArrowDropIcon_(
media_router.MediaRouterView.SINK_LIST));
});
......
ui/webui/resources/cr_elements/icons.html
View file @ 5e7b1029
......@@ -28,8 +28,10 @@ blurry at 20 px). Please use 20 px icons when available.
-->
<g id="account-child-invert" viewBox="0 0 48 48"><path d="M24 4c3.31 0 6 2.69 6 6s-2.69 6-6 6-6-2.69-6-6 2.69-6 6-6z"></path><path fill="none" d="M0 0h48v48H0V0z"></path><circle fill="none" cx="24" cy="26" r="4"></circle><path d="M24 18c-6.16 0-13 3.12-13 7.23v11.54c0 2.32 2.19 4.33 5.2 5.63 2.32 1 5.12 1.59 7.8 1.59.66 0 1.33-.06 2-.14v-5.2c-.67.08-1.34.14-2 .14-2.63 0-5.39-.57-7.68-1.55.67-2.12 4.34-3.65 7.68-3.65.86 0 1.75.11 2.6.29 2.79.62 5.2 2.15 5.2 4.04v4.47c3.01-1.31 5.2-3.31 5.2-5.63V25.23C37 21.12 30.16 18 24 18zm0 12c-2.21 0-4-1.79-4-4s1.79-4 4-4 4 1.79 4 4-1.79 4-4 4z"></path></g>
<g id="add"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></g>
<g id="arrow-back"><path d="M20 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H20v-2z"></path></g>
<g id="arrow-drop-up"><path d="M7 14l5-5 5 5z"></g>
<g id="arrow-drop-down"><path d="M7 10l5 5 5-5z"></path></g>
<g id="arrow-forward"><path d="M12 4l-1.41 1.41L16.17 11H4v2h12.17l-5.58 5.59L12 20l8-8z"></path></g>
<if expr="chromeos">
<g id="bluetooth"><path d="M17.71 7.71L12 2h-1v7.59L6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 11 14.41V22h1l5.71-5.71-4.3-4.29 4.3-4.29zM13 5.83l1.88 1.88L13 9.59V5.83zm1.88 10.46L13 18.17v-3.76l1.88 1.88z"></path></g>
<g id="camera-alt"><circle cx="12" cy="12" r="3.2"></circle><path d="M9 2L7.17 4H4c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2h-3.17L15 2H9zm3 15c-2.76 0-5-2.24-5-5s2.24-5 5-5 5 2.24 5 5-2.24 5-5 5z"></path></g>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment