Skip to content

GitLab

T
tangled
Commit 0d575207 authored by John Lee's avatar John Lee Committed by Commit Bot
Browse files
Options

Settings WebUI: Update chrome://settings/device to use cr-link-row 

Change-Id: Ia467b55e2e56df946dfd7a0268c3bc1ccad2f291
Reviewed-on: https://chromium-review.googlesource.com/c/1391719Reviewed-by: default avatarHector Carmona <hcarmona@chromium.org>
Commit-Queue: John Lee <johntlee@chromium.org>
Cr-Commit-Position: refs/heads/master@{#619809}
parent e5d0a916
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 62 deletions
chrome/browser/resources/settings/device_page/device_page.html
View file @ 0d575207
<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_link_row/cr_link_row.html">
<link rel="import" href="chrome://resources/html/i18n_behavior.html"> <link rel="import" href="chrome://resources/html/i18n_behavior.html">
<link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button-light.html"> <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button-light.html">
...@@ -22,55 +23,51 @@ ...@@ -22,55 +23,51 @@
<settings-animated-pages id="pages" section="device" <settings-animated-pages id="pages" section="device"
focus-config="[[focusConfig_]]"> focus-config="[[focusConfig_]]">
<div id="main" route-path="default"> <div id="main" route-path="default">
<div id="pointersRow" class="settings-box first" <cr-link-row
on-click="onPointersTap_" actionable> icon-class="subpage-arrow"
<div class="start"> id="pointersRow"
[[getPointersTitle_(hasMouse_, hasTouchpad_)]] label="[[getPointersTitle_(hasMouse_, hasTouchpad_)]]"
</div> on-click="onPointersTap_">
<paper-icon-button-light class="subpage-arrow"> </cr-link-row>
<button <cr-link-row
aria-label$="[[getPointersTitle_(hasMouse_, hasTouchpad_)]]"> class="hr"
</button> icon-class="subpage-arrow"
</paper-icon-button-light> id="keyboardRow"
</div> label="$i18n{keyboardTitle}"
<div id="keyboardRow" class="settings-box" on-click="onKeyboardTap_" on-click="onKeyboardTap_">
actionable> </cr-link-row>
<div class="start">$i18n{keyboardTitle}</div>
<paper-icon-button-light class="subpage-arrow">
<button aria-label="$i18n{keyboardTitle}"></button>
</paper-icon-button-light>
</div>
<template is="dom-if" if="[[hasStylus_]]"> <template is="dom-if" if="[[hasStylus_]]">
<div id="stylusRow" class="settings-box" on-click="onStylusTap_" <cr-link-row
actionable> class="hr"
<div class="start">$i18n{stylusTitle}</div> icon-class="subpage-arrow"
<paper-icon-button-light class="subpage-arrow"> id="stylusRow"
<button aria-label="$i18n{stylusTitle}"></button> label="$i18n{stylusTitle}"
</paper-icon-button-light> on-click="onStylusTap_">
</div> </cr-link-row>
</template> </template>
<div id="displayRow" class="settings-box" on-click="onDisplayTap_" <cr-link-row
actionable> class="hr"
<div class="start">$i18n{displayTitle}</div> icon-class="subpage-arrow"
<paper-icon-button-light class="subpage-arrow"> id="displayRow"
<button aria-label="$i18n{displayTitle}"></button> label="$i18n{displayTitle}"
</paper-icon-button-light> on-click="onDisplayTap_">
</div> </cr-link-row>
<div id="storageRow" hidden="[[hideStorageInfo_]]" class="settings-box" <cr-link-row
on-click="onStorageTap_" actionable> class="hr"
<div class="start">$i18n{storageTitle}</div> hidden="[[hideStorageInfo_]]"
<paper-icon-button-light class="subpage-arrow"> icon-class="subpage-arrow"
<button aria-label="$i18n{storageTitle}"></button> id="storageRow"
</paper-icon-button-light> label="$i18n{storageTitle}"
</div> on-click="onStorageTap_">
</cr-link-row>
<template is="dom-if" if="[[enablePowerSettings_]]"> <template is="dom-if" if="[[enablePowerSettings_]]">
<div id="powerRow" class="settings-box" on-click="onPowerTap_" <cr-link-row
actionable> class="hr"
<div class="start">$i18n{powerTitle}</div> icon-class="subpage-arrow"
<paper-icon-button-light class="subpage-arrow"> id="powerRow"
<button aria-label="$i18n{powerTitle}"></button> label="$i18n{powerTitle}"
</paper-icon-button-light> on-click="onPowerTap_">
</div> </cr-link-row>
</template> </template>
</div> </div>
<template is="dom-if" route-path="/pointer-overlay"> <template is="dom-if" route-path="/pointer-overlay">
......
chrome/browser/resources/settings/device_page/device_page.js
View file @ 0d575207
...@@ -74,32 +74,22 @@ Polymer({ ...@@ -74,32 +74,22 @@ Polymer({
value: function() { value: function() {
const map = new Map(); const map = new Map();
if (settings.routes.POINTERS) { if (settings.routes.POINTERS) {
map.set( map.set(settings.routes.POINTERS.path, '#pointersRow');
settings.routes.POINTERS.path,
'#pointersRow .subpage-arrow button');
} }
if (settings.routes.KEYBOARD) { if (settings.routes.KEYBOARD) {
map.set( map.set(settings.routes.KEYBOARD.path, '#keyboardRow');
settings.routes.KEYBOARD.path,
'#keyboardRow .subpage-arrow button');
} }
if (settings.routes.STYLUS) { if (settings.routes.STYLUS) {
map.set( map.set(settings.routes.STYLUS.path, '#stylusRow');
settings.routes.STYLUS.path, '#stylusRow .subpage-arrow button');
} }
if (settings.routes.DISPLAY) { if (settings.routes.DISPLAY) {
map.set( map.set(settings.routes.DISPLAY.path, '#displayRow');
settings.routes.DISPLAY.path,
'#displayRow .subpage-arrow button');
} }
if (settings.routes.STORAGE) { if (settings.routes.STORAGE) {
map.set( map.set(settings.routes.STORAGE.path, '#storageRow');
settings.routes.STORAGE.path,
'#storageRow .subpage-arrow button');
} }
if (settings.routes.POWER) { if (settings.routes.POWER) {
map.set( map.set(settings.routes.POWER.path, '#powerRow');
settings.routes.POWER.path, '#powerRow .subpage-arrow button');
} }
return map; return map;
}, },
......
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