Commit 35a44c18 authored by James Hawkins's avatar James Hawkins Committed by Commit Bot

OS Settings: Use cr-icon-button with title instead of iron-icon.

This change fixes a missing 'Remove' tooltip on the network proxy
exclusion list items.

R=maybelle@chromium.org

Bug: 976663
Test: none
Change-Id: I912b28da1301b6794516146402fde7a4a284deb4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1669183Reviewed-by: default avatarSteven Bennetts <stevenjb@chromium.org>
Reviewed-by: default avatarMay Lippert <maybelle@chromium.org>
Commit-Queue: James Hawkins <jhawkins@chromium.org>
Auto-Submit: James Hawkins <jhawkins@chromium.org>
Cr-Commit-Position: refs/heads/master@{#671412}
parent 26a06fb0
...@@ -151,6 +151,7 @@ void AddCommonStrings(content::WebUIDataSource* html_source, Profile* profile) { ...@@ -151,6 +151,7 @@ void AddCommonStrings(content::WebUIDataSource* html_source, Profile* profile) {
{"menuButtonLabel", IDS_SETTINGS_MENU_BUTTON_LABEL}, {"menuButtonLabel", IDS_SETTINGS_MENU_BUTTON_LABEL},
{"moreActions", IDS_SETTINGS_MORE_ACTIONS}, {"moreActions", IDS_SETTINGS_MORE_ACTIONS},
{"ok", IDS_OK}, {"ok", IDS_OK},
{"remove", IDS_REMOVE},
{"restart", IDS_SETTINGS_RESTART}, {"restart", IDS_SETTINGS_RESTART},
#if !defined(OS_CHROMEOS) #if !defined(OS_CHROMEOS)
{"restartToApplyChanges", IDS_SETTINGS_RESTART_TO_APPLY_CHANGES}, {"restartToApplyChanges", IDS_SETTINGS_RESTART_TO_APPLY_CHANGES},
......
<link rel="import" href="chrome://resources/html/polymer.html"> <link rel="import" href="chrome://resources/html/polymer.html">
<link rel="import" href="chrome://resources/cr_elements/cr_icon_button/cr_icon_button.html">
<link rel="import" href="chrome://resources/cr_elements/hidden_style_css.html"> <link rel="import" href="chrome://resources/cr_elements/hidden_style_css.html">
<link rel="import" href="chrome://resources/cr_elements/icons.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html"> <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html">
<link rel="import" href="network_shared_css.html"> <link rel="import" href="network_shared_css.html">
<dom-module id="network-proxy-exclusions"> <dom-module id="network-proxy-exclusions">
<template> <template>
<style include="network-shared cr-hidden-style iron-flex"> <style include="network-shared cr-hidden-style iron-flex">
iron-icon {
@apply --cr-actionable;
margin: 5px;
}
#container { #container {
align-self: stretch; align-self: stretch;
border: 1px solid lightgrey; border: 1px solid lightgrey;
...@@ -26,9 +21,9 @@ ...@@ -26,9 +21,9 @@
<template is="dom-repeat" items="[[exclusions]]"> <template is="dom-repeat" items="[[exclusions]]">
<div class="layout horizontal center" tabindex="0" > <div class="layout horizontal center" tabindex="0" >
<div class="flex">[[item]]</div> <div class="flex">[[item]]</div>
<iron-icon class="favicon-image" icon="cr:clear" <cr-icon-button class="icon-clear" hidden="[[!editable]]"
on-tap="onRemoveTap_" tabindex="0" hidden="[[!editable]]"> title="$i18n{remove}" on-click="onRemoveTap_">
</iron-icon> </cr-icon-button>
</div> </div>
</template> </template>
</div> </div>
......
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