Made Continue button disabled in right time.

BUG=252434
TEST=manually

Review URL: https://chromiumcodereview.appspot.com/17884002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208944 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 14 insertions, 11 deletions

diff --git a/chrome/browser/chromeos/login/screens/network_screen.cc b/chrome/browser/chromeos/login/screens/network_screen.cc
index c79d620..167c867 100644
--- a/chrome/browser/chromeos/login/screens/network_screen.cc
+++ b/chrome/browser/chromeos/login/screens/network_screen.cc
@@ -59,9 +59,9 @@ void NetworkScreen::PrepareToShow() {
 }
 
 void NetworkScreen::Show() {
+  Refresh();
   if (actor_)
     actor_->Show();
-  Refresh();
 }
 
 void NetworkScreen::Hide() {
diff --git a/chrome/browser/resources/chromeos/login/login.js b/chrome/browser/resources/chromeos/login/login.js
index 7fcb7a69b..edfaef2 100644
--- a/chrome/browser/resources/chromeos/login/login.js
+++ b/chrome/browser/resources/chromeos/login/login.js
@@ -41,7 +41,6 @@ cr.define('cr.ui.Oobe', function() {
     handleSpokenFeedbackClick: function(e) {},
     handleHighContrastClick: function(e) {},
     handleScreenMagnifierClick: function(e) {},
-    enableContinueButton: function(enable) {},
     setUsageStats: function(checked) {},
     setOemEulaUrl: function(oemEulaUrl) {},
     setUpdateProgress: function(progress) {},
diff --git a/chrome/browser/resources/chromeos/login/oobe.js b/chrome/browser/resources/chromeos/login/oobe.js
index 9e41fc3..addeec6 100644
--- a/chrome/browser/resources/chromeos/login/oobe.js
+++ b/chrome/browser/resources/chromeos/login/oobe.js
@@ -160,14 +160,6 @@ cr.define('cr.ui.Oobe', function() {
     },
 
     /**
-     * Enables/disables continue button.
-     * @param {boolean} enable Should the button be enabled?
-     */
-    enableContinueButton: function(enable) {
-      $('continue-button').disabled = !enable;
-    },
-
-    /**
      * Sets usage statistics checkbox.
      * @param {boolean} checked Is the checkbox checked?
      */
diff --git a/chrome/browser/resources/chromeos/login/oobe_screen_network.js b/chrome/browser/resources/chromeos/login/oobe_screen_network.js
index 37dab68..b6b2798 100644
--- a/chrome/browser/resources/chromeos/login/oobe_screen_network.js
+++ b/chrome/browser/resources/chromeos/login/oobe_screen_network.js
@@ -9,6 +9,7 @@
 login.createScreen('NetworkScreen', 'connect', function() {
   return {
     EXTERNAL_API: [
+      'enableContinueButton',
       'showError'
     ],
 
@@ -37,6 +38,7 @@ login.createScreen('NetworkScreen', 'connect', function() {
 
     onBeforeHide: function() {
       cr.ui.DropDown.hide('networks-list');
+      this.enableContinueButton(false);
     },
 
     /**
@@ -55,8 +57,10 @@ login.createScreen('NetworkScreen', 'connect', function() {
       var buttons = [];
 
       var continueButton = this.ownerDocument.createElement('button');
+      continueButton.disabled = true;
       continueButton.id = 'continue-button';
       continueButton.textContent = loadTimeData.getString('continueButton');
+      continueButton.classList.add('preserve-disabled-state');
       continueButton.addEventListener('click', function(e) {
         chrome.send('networkOnExit');
         e.stopPropagation();
@@ -74,6 +78,14 @@ login.createScreen('NetworkScreen', 'connect', function() {
     },
 
     /**
+     * Enables/disables continue button.
+     * @param {boolean} enable Should the button be enabled?
+     */
+    enableContinueButton: function(enable) {
+      $('continue-button').disabled = !enable;
+    },
+
+    /**
      * Shows the network error message.
      * @param {string} message Message to be shown.
      */
diff --git a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
index 4044379..8d96641 100644
--- a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
@@ -89,7 +89,7 @@ void NetworkScreenHandler::ShowConnectingStatus(
 void NetworkScreenHandler::EnableContinue(bool enabled) {
   is_continue_enabled_ = enabled;
   if (page_is_ready())
-    CallJS("cr.ui.Oobe.enableContinueButton", enabled);
+    CallJS("login.NetworkScreen.enableContinueButton", enabled);
 }
 
 // NetworkScreenHandler, BaseScreenHandler implementation: --------------------