Index: chrome/browser/resources/settings/downloads_page/downloads_page.html |
diff --git a/chrome/browser/resources/settings/downloads_page/downloads_page.html b/chrome/browser/resources/settings/downloads_page/downloads_page.html |
index ec65dd532c0d7510787b32a1f385b8234fc9a7a6..f7a84a2a7bd89e57d7e38ed5a25379334ef8b354 100644 |
--- a/chrome/browser/resources/settings/downloads_page/downloads_page.html |
+++ b/chrome/browser/resources/settings/downloads_page/downloads_page.html |
@@ -1,25 +1,25 @@ |
-<link rel="import" href="chrome://resources/polymer/polymer/polymer.html"> |
-<link rel="import" href="chrome://resources/polymer/core-label/core-label.html"> |
-<link rel="import" href="chrome://resources/polymer/paper-input/paper-input.html"> |
-<link rel="import" href="chrome://resources/polymer/paper-shadow/paper-shadow.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/v0_8/polymer/polymer.html"> |
+<link rel="import" href="chrome://resources/polymer/v0_8/iron-flex-layout/classes/iron-flex-layout.html"> |
+<link rel="import" href="chrome://resources/polymer/v0_8/paper-input/paper-input.html"> |
+<link rel="import" href="chrome://resources/polymer/v0_8/paper-material/paper-material.html"> |
+<link rel="import" href="chrome://resources/cr_elements/v0_8/cr_button/cr_button.html"> |
+<link rel="import" href="chrome://resources/cr_elements/v0_8/cr_input/cr_input.html"> |
<link rel="import" href="chrome://md-settings/checkbox/checkbox.html"> |
-<link rel="import" href="downloads_page_style.html"> |
-<polymer-element name="cr-settings-downloads-page"> |
+<dom-module id="cr-settings-downloads-page"> |
+ <link rel="import" type="css" href="chrome://md-settings/settings_page/settings_page.css"> |
+ <link rel="import" type="css" href="downloads_page.css"> |
<template> |
- <link rel="stylesheet" href="chrome://md-settings/settings_page/settings_page.css"> |
- <core-style ref="downloadsPageStyle"></core-style> |
- <paper-shadow layout vertical cross-fade> |
- <div horizontal layout center> |
- <core-label horizontal layout center> |
- <span class="location-label" i18n-content="downloadsLocationLabel"></span> |
+ <paper-material> |
+ <div class="horizontal layout center"> |
+ <div class="layout horizontal center"> |
+ <div id="locationLabel" i18n-content="downloadsLocationLabel"></div> |
michaelpg
2015/05/12 07:27:47
This puts the label above the input instead of alo
Jeremy Klein
2015/05/12 22:24:17
No, this works because of the flexbox of the wrapp
|
<cr-input id="downloadsPath" floatingLabel="false" |
michaelpg
2015/05/12 07:27:47
BTW, looks like we need iron-input added to polyme
Jeremy Klein
2015/05/12 22:24:18
Done.
|
- value="{{prefs.settings.download.default_directory.value}}" readonly for> |
+ value="{{prefs.settings.download.default_directory.value}}" |
+ readonly aria-labelledby="locationLabel"> |
</cr-input> |
- </core-label> |
- <cr-button id="changeDownloadsPath" on-click="{{selectDownloadLocation}}" |
+ </div> |
+ <cr-button id="changeDownloadsPath" on-click="selectDownloadLocation_" |
i18n-content="downloadsChangeLocationButton"> |
</cr-button> |
</div> |
@@ -27,7 +27,7 @@ |
pref="{{prefs.settings.download.prompt_for_download}}" |
i18n-values="label:downloadsPromptForDownloadLabel"> |
</cr-settings-checkbox> |
- </paper-shadow> |
+ </paper-material> |
</template> |
<script src="downloads_page.js"></script> |
-</polymer-element> |
+</dom-module> |