Merge 168235

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

 // Copyright (c) 2012 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 signin screen implementation.
  */
 
 cr.define('login', function() {
   // Gaia loading time after which portal check should be fired.
@@ skipping 262 matching lines @@
       }
 
       var msg = e.data;
       console.log('GaiaSigninScreen.onMessage_: method=' + msg.method);
 
       if (msg.method == 'completeLogin') {
         chrome.send('completeLogin', [msg.email, msg.password]);
         this.loading = true;
         // Now that we're in logged in state header should be hidden.
         Oobe.getInstance().headerHidden = true;
+        // Clear any error messages that were shown before login.
+        Oobe.clearErrors();
       } else if (msg.method == 'loginUILoaded') {
         this.loading = false;
         $('error-message').update();
         this.clearLoadingTimer_();
         // Show deferred error bubble.
         if (this.errorBubble_) {
           this.showErrorBubble(this.errorBubble_[0], this.errorBubble_[1]);
           this.errorBubble_ = undefined;
         }
         this.clearRetry_();
@@ skipping 137 matching lines @@
    * @param {Object} data New extension parameters bag.
    */
   GaiaSigninScreen.updateAuthExtension = function(data) {
     $('gaia-signin').updateAuthExtension_(data);
   };
 
   return {
     GaiaSigninScreen: GaiaSigninScreen
   };
 });