[Merge-M56] arc: Change default button to 'Agree' for Arc OOBE OptIn page.

chrome/browser/resources/chromeos/login/screen_arc_terms_of_service.js

 // 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.
 
 /**
  * @fileoverview Oobe Arc Terms of Service screen implementation.
  */
 
 login.createScreen('ArcTermsOfServiceScreen', 'arc-tos',
   function() { return {
@@ skipping 133 matching lines @@
 
     /**
      * Buttons in Oobe wizard's button strip.
      * @type {array} Array of Buttons.
      */
     get buttons() {
       var buttons = [];
 
       var skipButton = this.ownerDocument.createElement('button');
       skipButton.id = 'arc-tos-skip-button';
+      skipButton.disabled = this.classList.contains('arc-tos-loading');
+      skipButton.classList.add('preserve-disabled-state');
       skipButton.textContent =
           loadTimeData.getString('arcTermsOfServiceSkipButton');
       skipButton.addEventListener('click', function(event) {
         $('arc-tos-skip-button').disabled = true;
         $('arc-tos-accept-button').disabled = true;
         chrome.send('arcTermsOfServiceSkip');
       });
       buttons.push(skipButton);
 
       var retryButton = this.ownerDocument.createElement('button');
@@ skipping 62 matching lines @@
     /**
      * Reloads Play Store.
      */
     reloadPlayStore: function() {
       this.termsError = false;
       var termsView = $('arc-tos-view');
       termsView.src = 'https://play.google.com/about/play-terms.html';
       this.classList.remove('arc-tos-loaded');
       this.classList.remove('error');
       this.classList.add('arc-tos-loading');
+
+      $('arc-tos-accept-button').disabled = true;
+      $('arc-tos-skip-button').disabled = true;
     },
 
     /**
      * Handles event when terms view is loaded.
      */
     onTermsViewContentLoad: function() {
       if (this.termsError) {
         return;
       }
 
       this.classList.remove('arc-tos-loading');
       this.classList.remove('error');
       this.classList.add('arc-tos-loaded');
 
       var acceptButton = $('arc-tos-accept-button');
       var skipButton = $('arc-tos-skip-button');
 
+      skipButton.disabled = false;
       acceptButton.disabled = false;
-      if (document.activeElement != skipButton) {
-        acceptButton.focus();
-      }
+      acceptButton.focus();
 
       var termsView = $('arc-tos-view');
       var termsViewContainer = $('arc-tos-view-container');
       var setTermsHeight = function() {
         // Reset terms-view height in order to stabilize style computation.
         // For some reason, child webview affects final result.
         termsView.style.height = '0px';
         var style = window.getComputedStyle(termsViewContainer, null);
         var height = style.getPropertyValue('height');
         termsView.style.height = height;
       };
       setTimeout(setTermsHeight, 0);
     },
 
     /**
      * Handles event when terms view cannot be loaded.
      */
     onTermsViewErrorOccurred: function(details) {
       this.termsError = true;
       this.classList.remove('arc-tos-loading');
       this.classList.remove('arc-tos-loaded');
       this.classList.add('error');
+
+      $('arc-tos-retry-button').focus();
     },
 
     /**
      * Event handler that is invoked just before the screen is shown.
      * @param {object} data Screen init payload.
      */
     onBeforeShow: function(data) {
       Oobe.getInstance().headerHidden = true;
 
       // Reload caption image in case it was not loaded during the
@@ skipping 18 matching lines @@
       };
 
       var leanMoreLocationServiceText =
           loadTimeData.getString('arcLearnMoreLocationService');
       $('learn-more-link-location-service').onclick = function() {
         self.showLearnMoreOverlay(leanMoreLocationServiceText);
       };
     }
   };
 });