Chromium Code Reviews| Index: chrome/browser/resources/settings/device_page/device_page.html |
| diff --git a/chrome/browser/resources/settings/device_page/device_page.html b/chrome/browser/resources/settings/device_page/device_page.html |
| index bd77189c05684a9d95df3a575cc1a15988b465f5..92a32c947711c5aa97355b75c83ca09c4b063775 100644 |
| --- a/chrome/browser/resources/settings/device_page/device_page.html |
| +++ b/chrome/browser/resources/settings/device_page/device_page.html |
| @@ -8,6 +8,7 @@ |
| <link rel="import" href="display.html"> |
| <link rel="import" href="keyboard.html"> |
| <link rel="import" href="pointers.html"> |
| +<link rel="import" href="power.html"> |
| <link rel="import" href="storage.html"> |
| <link rel="import" href="stylus.html"> |
| <link rel="import" href="../prefs/prefs.html"> |
| @@ -57,31 +58,11 @@ |
| aria-label="$i18n{storageTitle}"></button> |
| </div> |
| <template is="dom-if" if="[[enablePowerSettings_]]"> |
| - <div id="powerRow" class="settings-box two-line"> |
| - <div class="start"> |
| - <div>[[powerLabel_]]</div> |
| - <div class="secondary">[[batteryStatus_.statusText]]</div> |
| - </div> |
| - <div class="md-select-wrapper" |
| - hidden$="[[!showPowerDropdown_]]"> |
| - <select id="powerSource" class="md-select" |
| - on-change="onPowerSourceChange_"> |
| - <option value="" |
| - selected$="[[isEqual_('', selectedPowerSourceId_)]]"> |
| - $i18n{powerSourceBattery} |
| - </option> |
| - <template is="dom-repeat" items="[[powerSources_]]"> |
| - <option value="[[item.id]]" |
| - selected$="[[isEqual_(item.id, selectedPowerSourceId_)]]"> |
| - [[item.description]] |
| - </option> |
| - </template> |
| - </select> |
| - <span class="md-select-underline"></span> |
| - </div> |
| - <div hidden$="[[showPowerDropdown_]]"> |
| - [[powerSourceName_]] |
| - </div> |
| + <div id="powerRow" class="settings-box" on-tap="onPowerTap_" |
| + actionable> |
| + <div class="start">$i18n{powerTitle}</div> |
| + <button class="subpage-arrow" is="paper-icon-button-light" |
| + arial-label="$i18n{powerTitle}"></button> |
| </div> |
| </template> |
| </neon-animatable> |
| @@ -122,6 +103,14 @@ |
| <settings-storage></settings-storage> |
| </settings-subpage> |
| </template> |
| + <template is="dom-if" route-path="/power"> |
|
stevenjb
2017/03/01 17:19:43
This is a subtle issue I just learned about:
Since
Daniel Erat
2017/03/01 23:01:53
Done.
|
| + <settings-subpage |
| + associated-control="[[$$('#powerRow')]]" |
| + page-title="$i18n{powerTitle}"> |
| + <settings-power enable-power-settings="[[enablePowerSettings_]]"> |
| + </settings-power> |
| + </settings-subpage> |
| + </template> |
| </settings-animated-pages> |
| </template> |
| <script src="device_page.js"></script> |