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

Unified Diff: chrome/browser/resources/chromeos/login/saml_confirm_password.html

Issue 1179323005: Polymer upgraded to 1.0 in login flow. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@polymer_pre_migration
Patch Set: Comments addressed. Created 5 years, 6 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
Index: chrome/browser/resources/chromeos/login/saml_confirm_password.html
diff --git a/chrome/browser/resources/chromeos/login/saml_confirm_password.html b/chrome/browser/resources/chromeos/login/saml_confirm_password.html
index 80327b73f6329aec5c31bb9acb871fbd1eb2e71f..f10e848b230f8154de6f8f51b8e2c79975bd80d9 100644
--- a/chrome/browser/resources/chromeos/login/saml_confirm_password.html
+++ b/chrome/browser/resources/chromeos/login/saml_confirm_password.html
@@ -1,8 +1,15 @@
-<link rel="import" href="chrome://resources/polymer/polymer/polymer.html">
-<link rel="import" href="chrome://resources/polymer/polymer/layout.html">
-<link rel="import" href="chrome://resources/polymer/core-animated-pages/core-animated-pages.html">
-<link rel="import" href="chrome://resources/polymer/core-animated-pages/transitions/cross-fade.html">
-<link rel="import" href="chrome://resources/polymer/paper-dialog/paper-action-dialog.html">
+<!-- Copyright 2015 The Chromium Authors. All rights reserved.
+ Use of this source code is governed by a BSD-style license that can be
+ found in the LICENSE file. -->
+
+<link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classes/iron-flex-layout.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/animations/fade-in-animation.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/animations/fade-out-animation.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-animatable.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-animated-pages.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/paper-dialog/paper-dialog.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">
<!--
SAML password confirmation UI for the New Gaia flow.
@@ -30,48 +37,54 @@
empties password field and enables buttons.
'focus' - If the current card is the first one, focuses password input.
-->
-<polymer-element name="saml-confirm-password" vertical layout
- attributes="email">
+<dom-module name="saml-confirm-password">
+ <link rel="stylesheet" href="saml_confirm_password.css">
+
<template>
- <link rel="stylesheet" href="saml_confirm_password.css">
- <core-animated-pages id="animatedPages" transitions="cross-fade-all" flex
- on-core-animated-pages-transition-end="{{onTransitionEnd}}">
- <section flex>
- <gaia-card id="confirmPasswordCard">
- <gaia-header class="header" email="{{email}}">
+ <neon-animated-pages id="animatedPages" class="fit"
+ entry-animation="fade-in-animation" exit-animation="fade-out-animation"
+ on-neon-animation-finish="onAnimationFinish_" selected="0">
+ <neon-animatable class="fit">
+ <gaia-card id="confirmPasswordCard" class="fit">
+ <gaia-header class="header flex" email="[[email]]">
</gaia-header>
- <div horizontal layout center class="footer gaia-body-text">
+ <div class="footer gaia-body-text horizontal layout center">
<p i18n-content="confirmPasswordTitle">
</p>
</div>
<gaia-input-form id="inputForm" class="footer"
- on-submit="{{onPasswordSubmitted}}"
- i18n-values="buttonText:nextButtonText">
+ on-submit="onPasswordSubmitted_" disabled="[[disabled]]"
+ i18n-values="button-text:nextButtonText">
<gaia-input id="passwordInput" type="password" required
i18n-values="error:confirmPasswordIncorrectPassword;
label:confirmPasswordLabel;">
</gaia-input>
</gaia-input-form>
- <paper-action-dialog class="footer" id="cancelConfirmDlg"
- layered="false">
- <p i18n-content="accountSetupCancelDialogTitle"></p>
- <gaia-button type="dialog" affirmative autofocus
- i18n-content="accountSetupCancelDialogNo">
- </gaia-button>
- <gaia-button type="dialog" on-tap="{{onConfirmCancel}}" affirmative
- i18n-content="accountSetupCancelDialogYes">
- </gaia-button>
- </paper-action-dialog>
</gaia-card>
- </section>
- <section flex vertical layout center-justified>
- <throbber-notice i18n-values="text:gaiaLoadingNewGaia" self-center>
+ </neon-animatable>
+ <neon-animatable class="fit">
+ <throbber-notice i18n-values="text:gaiaLoadingNewGaia" class="fit">
</throbber-notice>
- </section>
- </core-animated-pages>
- <button id="closeButton" is="gaia-icon-button" icon="close"
- on-click="{{onClose}}" i18n-values="aria-label:closeButton"
- tabindex="0">
- </button>
+ </neon-animatable>
+ </neon-animated-pages>
+
+ <gaia-icon-button id="closeButton" icon="close" on-tap="onClose_"
+ disabled="[[disabled]]" i18n-values="aria-label:closeButton">
+ </gaia-icon-button>
+
+ <paper-dialog id="cancelConfirmDlg" no-cancel-on-outside-click
+ on-iron-overlay-closed="onDialogOverlayClosed_">
+ <h2 i18n-content="accountSetupCancelDialogTitle"></h2>
+ <div class="buttons">
+ <gaia-button type="dialog" dialog-dismiss autofocus
+ i18n-content="accountSetupCancelDialogNo">
+ </gaia-button>
+ <gaia-button type="dialog" dialog-confirm on-tap="onConfirmCancel_"
+ i18n-content="accountSetupCancelDialogYes">
+ </gaia-button>
+ </div>
+ </paper-dialog>
+
</template>
-</polymer-element>
+</dom-module>
+

Powered by Google App Engine
This is Rietveld 408576698