Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(47)

Unified Diff: chrome/browser/resources/settings/input/input.html

Issue 1368733002: Introduce cr-settings-input and eliminate cr-input (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_532540_elim_cr_toggle_button
Patch Set: Rebase Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/resources/settings/input/input.css ('k') | chrome/browser/resources/settings/input/input.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/settings/input/input.html
diff --git a/chrome/browser/resources/settings/checkbox/checkbox.html b/chrome/browser/resources/settings/input/input.html
similarity index 52%
copy from chrome/browser/resources/settings/checkbox/checkbox.html
copy to chrome/browser/resources/settings/input/input.html
index 8adebc1ddb4acc0a1c7b4ab74ae203738475385d..3eb78f42c3810f79aa143d5b51753c59c5f50bfb 100644
--- a/chrome/browser/resources/settings/checkbox/checkbox.html
+++ b/chrome/browser/resources/settings/input/input.html
@@ -1,24 +1,24 @@
<link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">
-<link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-checkbox.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input.html">
<link rel="import" href="chrome://resources/cr_elements/v1_0/cr_events/cr_events.html">
-<link rel="import" href="chrome://resources/cr_elements/v1_0/policy/cr_policy_indicator.html">
<link rel="import" href="chrome://md-settings/policy_controllable/policy_controllable.html">
<link rel="import" href="chrome://md-settings/pref_tracker/pref_tracker.html">
-<dom-module id="cr-settings-checkbox">
- <link rel="import" type="css" href="checkbox.css">
+<dom-module id="cr-settings-input">
+ <link rel="import" type="css" href="input.css">
<template>
<cr-events id="events"></cr-events>
<cr-settings-pref-tracker pref="[[pref]]"></cr-settings-pref-tracker>
<div id="outerDiv" class="layout horizontal center">
- <paper-checkbox id="checkbox" checked="{{checked}}"
- disabled="[[checkboxDisabled_(disabled, pref)]]">
- <span id="mainLabel">{{label}}</span>
- <span id="subLabel">{{subLabel}}</span>
- </paper-checkbox>
+ <paper-input id="input" auto-validate value="{{value}}"
+ error-message="[[errorMessage]]" label="[[label]]"
+ no-label-float="[[noLabelFloat]]" pattern="[[pattern]]"
+ readonly$="[[readonly]]" required="[[required]]" type="[[type]]"
+ on-blur="onBlur_" disabled="[[isDisabled_(disabled, pref)]]">
+ </paper-input>
<cr-policy-indicator pref="[[pref]]"></cr-policy-indicator>
</div>
</template>
- <script src="checkbox.js"></script>
+ <script src="input.js"></script>
</dom-module>
« no previous file with comments | « chrome/browser/resources/settings/input/input.css ('k') | chrome/browser/resources/settings/input/input.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698