Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / resources / cryptotoken / usbgnubbyfactory.js

diff --git a/src/chrome/browser/resources/cryptotoken/usbgnubbyfactory.js b/src/chrome/browser/resources/cryptotoken/usbgnubbyfactory.js
index 6363d36..4d32712 100644 (file)
--- a/src/chrome/browser/resources/cryptotoken/usbgnubbyfactory.js
+++ b/src/chrome/browser/resources/cryptotoken/usbgnubbyfactory.js
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 /**
- * @fileoverview Contains a simple factory for creating and opening usbGnubby
+ * @fileoverview Contains a simple factory for creating and opening Gnubby
  * instances.
  */
 'use strict';
@@ -16,30 +16,48 @@
 function UsbGnubbyFactory(gnubbies) {
   /** @private {Gnubbies} */
   this.gnubbies_ = gnubbies;
-  usbGnubby.setGnubbies(gnubbies);
+  Gnubby.setGnubbies(gnubbies);
 }
 
 /**
  * Creates a new gnubby object, and opens the gnubby with the given index.
- * @param {llGnubbyDeviceId} which The device to open.
+ * @param {GnubbyDeviceId} which The device to open.
  * @param {boolean} forEnroll Whether this gnubby is being opened for enrolling.
- * @param {function(number, usbGnubby=)} cb Called with result of opening the
- *     gnubby.
+ * @param {FactoryOpenCallback} cb Called with result of opening the gnubby.
  * @param {string=} logMsgUrl the url to post log messages to
  * @override
  */
 UsbGnubbyFactory.prototype.openGnubby =
     function(which, forEnroll, cb, logMsgUrl) {
-  var gnubby = new usbGnubby();
+  var gnubby = new Gnubby();
   gnubby.open(which, function(rc) {
-    cb(rc, gnubby);
+    if (rc) {
+      cb(rc, gnubby);
+      return;
+    }
+    gnubby.sync(function(rc) {
+      cb(rc, gnubby);
+    });
   });
 };
 
 /**
  * Enumerates gnubbies.
- * @param {function(number, Array.<llGnubbyDeviceId>)} cb Enumerate callback
+ * @param {function(number, Array.<GnubbyDeviceId>)} cb Enumerate callback
  */
 UsbGnubbyFactory.prototype.enumerate = function(cb) {
   this.gnubbies_.enumerate(cb);
 };
+
+/**
+ * No-op prerequisite check.
+ * @param {Gnubby} gnubby The not-enrolled gnubby.
+ * @param {string} appIdHash The base64-encoded hash of the app id for which
+ *     the gnubby being enrolled.
+ * @param {FactoryOpenCallback} cb Called with the result of the prerequisite
+ *     check. (A non-zero status indicates failure.)
+ */
+UsbGnubbyFactory.prototype.notEnrolledPrerequisiteCheck =
+    function(gnubby, appIdHash, cb) {
+  cb(DeviceStatusCodes.OK_STATUS, gnubby);
+};