HID fix for device info check.

chrome/browser/resources/chromeos/login/oobe_screen_hid_detection.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 Oobe HID detection screen implementation.
  */
 
 login.createScreen('HIDDetectionScreen', 'hid-detection', function() {
   return {
@@ skipping 61 matching lines @@
     setDeviceBlockState_: function(blockId, state) {
       if (state == 'update')
         return;
       var deviceBlock = $(blockId);
       var states = ['searching', 'connected', 'pairing', 'paired'];
       for (var i = 0; i < states.length; ++i) {
         if (states[i] != state)
           deviceBlock.classList.remove(states[i]);
       }
       deviceBlock.classList.add(state);
+
+      // 'Continue' button available iff at least one device is connected,
+      if ($('hid-mouse-block').classList.contains('connected') ||

[ygorshenin1, 2014/12/24 09:34:47]

Also, it would be nice to declare a dictionary for device block state and for
possible values of blockId.

[ygorshenin1, 2014/12/24 09:34:47]

I thought it would be better to rewrite predicate like this:
if ((blockId == 'hid-mouse-block' || blockId == 'hid-keyboard-block') &&
    (state == 'connected' || state == 'paired')) {
  ...
} else {
  ...
}

[merkulova, 2014/12/24 13:47:46]

Done.

[merkulova, 2014/12/24 13:47:46]

Done.

+          $('hid-mouse-block').classList.contains('paired') ||
+          $('hid-keyboard-block').classList.contains('connected') ||
+          $('hid-keyboard-block').classList.contains('paired')) {
+        $('hid-continue-button').disabled = false;
+      } else {
+        $('hid-continue-button').disabled = true;
+      }
     },
 
     /**
      * Sets state for mouse-block.
      * @param {state} one of 'searching', 'connected', 'paired'.
      */
     setPointingDeviceState: function(state) {
       if (state === undefined)
         return;
       this.setDeviceBlockState_('hid-mouse-block', state);
@@ skipping 43 matching lines @@
           announceAccessibleMessage(
               data['keyboard-label'] + ' ' + data['pincode'] + ' ' +
               loadTimeData.getString('hidDetectionBTEnterKey'));
         }
       } else if (state == 'update') {
         if ('keysEntered' in data) {
           this.setPincodeKeysState_(data['keysEntered']);
         }
       }
     },
-
-    /**

[ygorshenin1, 2014/12/24 09:34:47]

Why this code is removed?

[merkulova, 2014/12/24 13:47:46]

1. Its logic is wrong: if list of connected devices is already processed
(initial check) and for example keyboard was found and mouse wasn't, this might
lead to setting 'searching' state to an already connected device. And as far as
block for connected device isn't updated unless device disconnects, we get wrong
UI.
2. Initial state ('searching' or 'connected') is set via screen handler. At Show
method.

-     * Event handler that is invoked just before the screen in shown.
-     * @param {Object} data Screen init payload.
-     */
-    onBeforeShow: function(data) {
-      $('hid-continue-button').disabled = true;
-      this.setDeviceBlockState_('hid-mouse-block', 'searching');
-      this.setDeviceBlockState_('hid-keyboard-block', 'searching');
-    },
   };
 });