| Index: chrome/browser/resources/signin/signin_error/signin_error.js
|
| diff --git a/chrome/browser/resources/sync_confirmation/sync_confirmation.js b/chrome/browser/resources/signin/signin_error/signin_error.js
|
| similarity index 54%
|
| copy from chrome/browser/resources/sync_confirmation/sync_confirmation.js
|
| copy to chrome/browser/resources/signin/signin_error/signin_error.js
|
| index e22b4ddecc67c1dd4ebc7bdcea9dbb88703c9b5f..cdf8de49e51f7f2913b032699ecdcbf3f0987375 100644
|
| --- a/chrome/browser/resources/sync_confirmation/sync_confirmation.js
|
| +++ b/chrome/browser/resources/signin/signin_error/signin_error.js
|
| @@ -1,47 +1,23 @@
|
| -/* Copyright 2015 The Chromium Authors. All rights reserved.
|
| +/* Copyright 2016 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. */
|
|
|
| -cr.define('sync.confirmation', function() {
|
| +cr.define('signin.error', function() {
|
| 'use strict';
|
|
|
| - function onConfirm(e) {
|
| - chrome.send('confirm');
|
| - }
|
| -
|
| - function onUndo(e) {
|
| - chrome.send('undo');
|
| - }
|
| -
|
| - function onGoToSettings(e) {
|
| - chrome.send('goToSettings');
|
| - }
|
| -
|
| function initialize() {
|
| document.addEventListener('keydown', onKeyDown);
|
| $('confirmButton').addEventListener('click', onConfirm);
|
| - $('undoButton').addEventListener('click', onUndo);
|
| - $('settingsLink').addEventListener('click', onGoToSettings);
|
| - $('profile-picture').addEventListener('load', onPictureLoaded);
|
| + $('closeButton').addEventListener('click', onConfirm);
|
| + $('switchButton').addEventListener('click', onSwitchToExistingProfile);
|
| + $('learnMoreLink').addEventListener('click', onLearnMore);
|
| chrome.send('initializedWithSize', [document.body.scrollHeight]);
|
| }
|
|
|
| - function clearFocus() {
|
| - document.activeElement.blur();
|
| - }
|
| -
|
| - function setUserImageURL(url) {
|
| - $('profile-picture').src = url;
|
| - }
|
| -
|
| - function onPictureLoaded(e) {
|
| - $('picture-container').classList.add('loaded');
|
| - }
|
| -
|
| function onKeyDown(e) {
|
| // If the currently focused element isn't something that performs an action
|
| // on "enter" being pressed and the user hits "enter", perform the default
|
| - // action of the dialog, which is "OK, Got It".
|
| + // action of the dialog, which is "OK".
|
| if (e.key == 'Enter' &&
|
| !/^(A|PAPER-BUTTON)$/.test(document.activeElement.tagName)) {
|
| $('confirmButton').click();
|
| @@ -49,11 +25,33 @@ cr.define('sync.confirmation', function() {
|
| }
|
| }
|
|
|
| + function onConfirm(e) {
|
| + chrome.send('confirm');
|
| + }
|
| +
|
| + function onSwitchToExistingProfile(e) {
|
| + chrome.send('switchToExistingProfile');
|
| + }
|
| +
|
| + function onLearnMore(e) {
|
| + chrome.send('learnMore');
|
| + }
|
| +
|
| + function clearFocus() {
|
| + document.activeElement.blur();
|
| + }
|
| +
|
| + function removeSwitchButton() {
|
| + $('switchButton').hidden = true;
|
| + $('closeButton').hidden = true;
|
| + $('confirmButton').hidden = false;
|
| + }
|
| +
|
| return {
|
| - clearFocus: clearFocus,
|
| initialize: initialize,
|
| - setUserImageURL: setUserImageURL
|
| + clearFocus: clearFocus,
|
| + removeSwitchButton: removeSwitchButton
|
| };
|
| });
|
|
|
| -document.addEventListener('DOMContentLoaded', sync.confirmation.initialize);
|
| +document.addEventListener('DOMContentLoaded', signin.error.initialize);
|
|
|