Merge 159996 - Fix bug with login-prompt-visible not being sent in some rare cases.

chrome/browser/resources/chromeos/login/display_manager.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 Display manager for WebUI OOBE and login.
  */
 
 // TODO(xiyuan): Find a better to share those constants.
 /** @const */ var SCREEN_OOBE_NETWORK = 'connect';
@@ skipping 232 matching lines @@
           oldStep.classList.add('hidden');
         }
       } else {
         // First screen on OOBE launch.
         if (innerContainer.classList.contains('down')) {
           innerContainer.classList.remove('down');
           innerContainer.addEventListener(
               'webkitTransitionEnd', function f(e) {
                 innerContainer.removeEventListener('webkitTransitionEnd', f);
                 $('progress-dots').classList.remove('down');
-                chrome.send('loginVisible');
+                chrome.send('loginVisible', ['oobe']);
               });
         }
         newHeader.classList.remove('right');  // Old OOBE.
       }
       this.currentStep_ = nextStepIndex;
       $('oobe').className = nextStepId;
 
       $('step-logo').hidden = newStep.classList.contains('no-logo');
     },
 
@@ skipping 328 matching lines @@
     $('add-user-button').classList.add('button-restricted');
     $('add-user-button').title = disable ?
         localStrings.getString('disabledAddUserTooltip') : '';
   }
 
   // Export
   return {
     DisplayManager: DisplayManager
   };
 });