Fix handling for click that brings lock screen app to foreground

ui/login/account_picker/md_screen_account_picker.js

 // Copyright 2014 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 Account picker screen implementation.
  */
 
 login.createScreen('AccountPickerScreen', 'account-picker', function() {
   /**
@@ skipping 98 matching lines @@
     onAfterShow: function(data) {
       $('pod-row').handleAfterShow();
     },
 
     /**
      * Event handler that is invoked just before the frame is shown.
      * @param {string} data Screen init payload.
      */
     onBeforeShow: function(data) {
       this.showing_ = true;
+
+      this.ownerDocument.addEventListener('click',
+          this.handleOwnerDocClick_.bind(this));
+
       chrome.send('loginUIStateChanged', ['account-picker', true]);
       $('login-header-bar').signinUIState = SIGNIN_UI_STATE.ACCOUNT_PICKER;
       // Header bar should be always visible on Account Picker screen.
       Oobe.getInstance().headerHidden = false;
       chrome.send('hideCaptivePortal');
       var podRow = $('pod-row');
       podRow.handleBeforeShow();
 
       // In case of the preselected pod onShow will be called once pod
       // receives focus.
@@ skipping 344 matching lines @@
      * @param {LOCK_SCREEN_APPS_STATE} state The current lock screen apps state.
      */
     setLockScreenAppsState: function(state) {
       if (Oobe.getInstance().displayType != DISPLAY_TYPE.LOCK ||
           state == this.lockScreenAppsState_) {
         return;
       }
 
       this.lockScreenAppsState_ = state;
       $('login-header-bar').lockScreenAppsState = state;
-      // When an lock screen app window is in background - i.e. visible behind
-      // the lock screen UI - dim the lock screen background, so it's more
-      // noticeable that the app widow in background is not actionable.
-      $('background').classList.toggle(
-          'dimmed-background', state == LOCK_SCREEN_APPS_STATE.BACKGROUND);
     },
 
     /**
      * Handles clicks on the document which displays the account picker UI.
      * If the click event target is outer container - i.e. background portion of
      * UI with no other UI elements, and lock screen apps are in background, a
      * request is issued to chrome to move lock screen apps to foreground.
      * @param {Event} event The click event.
      */
     handleOwnerDocClick_: function(event) {
-      if (this.lockScreenAppsState_  != LOCK_SCREEN_APPS_STATE.BACKGROUND ||
-          event.target != $('outer-container')) {
+      if (this.lockScreenAppsState_ != LOCK_SCREEN_APPS_STATE.BACKGROUND ||
+          (event.target != $('account-picker') &&
+           event.target != $('version'))) {
         return;
       }
       chrome.send('setLockScreenAppsState',
                   [LOCK_SCREEN_APPS_STATE.FOREGROUND]);
 
       event.preventDefault();
       event.stopPropagation();
     },
   };
 });