Index: chrome/browser/resources/cryptotoken/cryptotokenbackground.js |
diff --git a/chrome/browser/resources/cryptotoken/cryptotokenbackground.js b/chrome/browser/resources/cryptotoken/cryptotokenbackground.js |
index 4839a3f49f386f61fcc637edbf98910ecf8044a2..b2ec97660581669a878324eed57c574eb976d929 100644 |
--- a/chrome/browser/resources/cryptotoken/cryptotokenbackground.js |
+++ b/chrome/browser/resources/cryptotoken/cryptotokenbackground.js |
@@ -23,43 +23,19 @@ var FACTORY_REGISTRY = new FactoryRegistry( |
var DEVICE_FACTORY_REGISTRY = new DeviceFactoryRegistry( |
new UsbGnubbyFactory(gnubbies), |
- TIMER_FACTORY); |
- |
-/** |
- * @param {Object} request Request object |
- * @param {MessageSender} sender Sender frame |
- * @param {Function} sendResponse Response callback |
- * @return {?Closeable} Optional handler object that should be closed when port |
- * closes |
- */ |
-function handleWebPageRequest(request, sender, sendResponse) { |
- switch (request.type) { |
- case GnubbyMsgTypes.ENROLL_WEB_REQUEST: |
- return handleWebEnrollRequest(sender, request, sendResponse); |
- |
- case GnubbyMsgTypes.SIGN_WEB_REQUEST: |
- return handleWebSignRequest(sender, request, sendResponse); |
- |
- case MessageTypes.U2F_REGISTER_REQUEST: |
- return handleU2fEnrollRequest(sender, request, sendResponse); |
- |
- case MessageTypes.U2F_SIGN_REQUEST: |
- return handleU2fSignRequest(sender, request, sendResponse); |
- |
- default: |
- sendResponse( |
- makeU2fErrorResponse(request, ErrorCodes.BAD_REQUEST, undefined, |
- MessageTypes.U2F_REGISTER_RESPONSE)); |
- return null; |
- } |
-} |
+ TIMER_FACTORY, |
+ new GoogleCorpIndividualAttestation()); |
// Listen to individual messages sent from (whitelisted) webpages via |
// chrome.runtime.sendMessage |
function messageHandlerExternal(request, sender, sendResponse) { |
var closeable = handleWebPageRequest(request, sender, function(response) { |
response['requestId'] = request['requestId']; |
- sendResponse(response); |
+ try { |
+ sendResponse(response); |
+ } catch (e) { |
+ console.warn(UTIL_fmt('caught: ' + e.message)); |
+ } |
}); |
} |
chrome.runtime.onMessageExternal.addListener(messageHandlerExternal); |